From owner-p4-projects@FreeBSD.ORG Mon Jul 18 07:42:12 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5354F1065670; Mon, 18 Jul 2011 07:42:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0728C106566B for ; Mon, 18 Jul 2011 07:42:12 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E77668FC0A for ; Mon, 18 Jul 2011 07:42:11 +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 p6I7gB1c035298 for ; Mon, 18 Jul 2011 07:42:11 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6I7gBg2035295 for perforce@freebsd.org; Mon, 18 Jul 2011 07:42:11 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 18 Jul 2011 07:42:11 GMT Message-Id: <201107180742.p6I7gBg2035295@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196333 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 Jul 2011 07:42:12 -0000 http://p4web.freebsd.org/@@196333?ac=10 Change 196333 by ilya@ilya_triton2011 on 2011/07/18 07:41:10 Remove dead code. Small tweaks Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#14 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#10 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#12 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#17 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#8 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#17 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#17 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#21 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#39 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#14 (text+ko) ==== @@ -87,26 +87,13 @@ /* misc */ -extern int fuse_useco; SYSCTL_DECL(_vfs_fuse); /* Fuse locking */ -#ifndef DO_GIANT_MANUALLY -#define DO_GIANT_MANUALLY 1 -#endif -#ifndef USE_FUSE_LOCK -#define USE_FUSE_LOCK 1 -#endif - -#if USE_FUSE_LOCK extern struct mtx fuse_mtx; #define FUSE_LOCK() fuse_lck_mtx_lock(fuse_mtx) #define FUSE_UNLOCK() fuse_lck_mtx_unlock(fuse_mtx) -#else -#define FUSE_LOCK() -#define FUSE_UNLOCK() -#endif #define RECTIFY_TDCR(td, cred) \ do { \ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#10 (text+ko) ==== @@ -51,14 +51,7 @@ .d_read = fuse_device_read, .d_write = fuse_device_write, .d_version = D_VERSION, -#ifndef D_NEEDMINOR -#define D_NEEDMINOR 0 -#endif -#if ! DO_GIANT_MANUALLY - .d_flags = D_NEEDMINOR|D_NEEDGIANT, -#else .d_flags = D_NEEDMINOR, -#endif }; /* @@ -85,36 +78,6 @@ { struct fuse_data *fdata; - /* - * We need to ensure data consistency on the main entry points - * of the module (so that we won't race with module unloading). - * I don't see a better way of doing this than using Giant. - * The lightest reliance on Giant is realized by the - * DO_GIANT_MANUALLY == USE_FUSE_LOCK == 1 combination. - * - * Then the device will operate D_NEEDGIANT-less, and the only - * point where Giant is used (apart from the obligatory places - * like module (un)load, (un)mount, etc.) is at the beginning - * of the device open routine, where destructive racing is - * prevented. - */ - -#if DO_GIANT_MANUALLY - fuse_lck_mtx_lock(Giant); -#endif - if (fuse_useco < 0) { - /* Module unload is going on */ -#if DO_GIANT_MANUALLY - fuse_lck_mtx_unlock(Giant); -#endif - DEBUG("caught in the middle of unload\n"); - return (ENOENT); - } -#if DO_GIANT_MANUALLY && USE_FUSE_LOCK - fuse_useco++; - fuse_lck_mtx_unlock(Giant); -#endif - if (dev->si_usecount > 1) goto busy; @@ -128,29 +91,16 @@ fdata_destroy(fdata); goto busy; } else { -#if ! (DO_GIANT_MANUALLY && USE_FUSE_LOCK) - fuse_useco++; -#endif fdata->dataflags |= FSESS_OPENED; dev->si_drv1 = fdata; } FUSE_UNLOCK(); -#if DO_GIANT_MANUALLY && ! USE_FUSE_LOCK - fuse_lck_mtx_unlock(Giant); -#endif DEBUG("%s: device opened by thread %d.\n", dev->si_name, td->td_tid); return(0); busy: -#if DO_GIANT_MANUALLY -#if USE_FUSE_LOCK - fuse_useco--; -#else - fuse_lck_mtx_unlock(Giant); -#endif -#endif return (EBUSY); } @@ -159,9 +109,6 @@ { struct fuse_data *data; -#if DO_GIANT_MANUALLY && ! USE_FUSE_LOCK - fuse_lck_mtx_lock(Giant); -#endif FUSE_LOCK(); data = fuse_get_devdata(dev); if (! data) @@ -198,11 +145,6 @@ fdata_destroy(data); out: -#if DO_GIANT_MANUALLY && ! USE_FUSE_LOCK - fuse_lck_mtx_unlock(Giant); -#endif - fuse_useco--; - DEBUG("%s: device closed by thread %d.\n", dev->si_name, td->td_tid); return(0); } @@ -451,26 +393,6 @@ } } else { /* no callback at all! */ - /* - * this is BAD: - * + if unique id was generated by fuse userspace, - * that's way too bogus. Userspace should only - * pass unique ids back and forth. - * + else we generated the unique id by - * fuse_ticket_fetch() somewhere in the foggy past. - * Now that ticket is either - * + dropped, which means it could have been - * reused by now, and then this answer we work - * with would be misdelivered (it's - * just luck that it's not the case now) - * + not dropped, which means it's either - * + lost: will be kept on busy list for - * the whole lifetime - * + someone will drop it randomly without - * any event based triggering (this - * would be the place for such a thing), - * which is just nonsense. - */ DEBUG("erhm, no handler for this response\n"); fdata_set_dead(data); @@ -545,11 +467,7 @@ i = clone_create(&fuseclones, &fuse_device_cdevsw, &unit, dev, 0); if (i) { *dev = make_dev(&fuse_device_cdevsw, -#if __FreeBSD_version < 800062 - unit2minor(unit), -#else /* __FreeBSD_version >= 800062 */ unit, -#endif /* __FreeBSD_version < 800062 */ UID_ROOT, GID_OPERATOR, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "fuse%d", unit); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#12 (text+ko) ==== @@ -152,7 +152,7 @@ } out: - atomic_add_acq_int(&fuse_fh_count, -1); + atomic_subtract_acq_int(&fuse_fh_count, 1); fufh->fh_id = (uint64_t)-1; fufh->fh_type = FUFH_INVALID; fuse_invalidate_attr(vp); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#17 (text+ko) ==== @@ -470,8 +470,6 @@ memcpy(fdip->indata, buf, bufsize); memcpy((char *)fdip->indata + bufsize, cnp->cn_nameptr, cnp->cn_namelen); ((char *)fdip->indata)[bufsize + cnp->cn_namelen] = '\0'; - - fdip->iosize = bufsize + cnp->cn_namelen + 1; } int ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#8 (text+ko) ==== @@ -25,10 +25,7 @@ static void fuse_bringdown(eventhandler_tag eh_tag); static int fuse_loader(struct module *m, int what, void *arg); -int fuse_useco = 0; -#if USE_FUSE_LOCK struct mtx fuse_mtx; -#endif extern void fuse_device_clone(void *arg, struct ucred *cred, char *name, @@ -66,9 +63,7 @@ EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); clone_cleanup(&fuseclones); -#if USE_FUSE_LOCK mtx_destroy(&fuse_mtx); -#endif } static int @@ -77,26 +72,18 @@ static eventhandler_tag eh_tag = NULL; int err = 0; - GIANT_REQUIRED; - switch (what) { case MOD_LOAD: /* kldload */ fuse_pbuf_freecnt = nswbuf / 2 + 1; clone_setup(&fuseclones); -#ifdef USE_FUSE_LOCK mtx_init(&fuse_mtx, "fuse_mtx", NULL, MTX_DEF); -#endif eh_tag = EVENTHANDLER_REGISTER(dev_clone, fuse_device_clone, 0, 1000); if (eh_tag == NULL) { clone_cleanup(&fuseclones); -#if USE_FUSE_LOCK mtx_destroy(&fuse_mtx); -#endif return (ENOMEM); } - /* Duh, it's static... */ - /* vfs_register(&fuse_vfsconf); */ /* vfs_modevent ignores its first arg */ if ((err = vfs_modevent(NULL, what, &fuse_vfsconf))) @@ -112,27 +99,9 @@ break; case MOD_UNLOAD: - KASSERT(fuse_useco >= 0, - ("fuse_useco is negative: %d", fuse_useco)); - if (fuse_useco > 0) { - DEBUGX(FUSE_DEBUG_INTERNAL, - "fuse_useco %d\n", fuse_useco); - return (EBUSY); - } - if ((err = vfs_modevent(NULL, what, &fuse_vfsconf))) return (err); - - /* - * at this point the counter falls below zero thus new init - * attempts will know that no brownie for them - */ - fuse_useco--; - fuse_bringdown(eh_tag); - - /* vfs_unregister(&fuse_vfsconf); */ - break; default: return (EINVAL); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#17 (text+ko) ==== @@ -65,8 +65,6 @@ } vp->v_type = vtyp; vp->v_data = fvdat; - sx_init(&fvdat->nodelock, "fuse node sx lock"); - sx_init(&fvdat->truncatelock, "fuse node truncate sx lock"); for (i = 0; i < FUFH_MAXTYPE; i++) fvdat->fufh[i].fh_type = FUFH_INVALID; @@ -80,11 +78,9 @@ struct fuse_vnode_data *fvdat = vp->v_data; vp->v_data = NULL; - sx_destroy(&fvdat->nodelock); - sx_destroy(&fvdat->truncatelock); free(fvdat, M_FUSEVN); - atomic_add_acq_int(&fuse_node_count, -1); + atomic_subtract_acq_int(&fuse_node_count, 1); } static int @@ -153,7 +149,7 @@ if (err) { VOP_UNLOCK(*vpp, 0); fuse_vnode_destroy(*vpp); - *vpp = NULL; + *vpp = NULL; return (err); } @@ -188,8 +184,8 @@ } if (dvp != NULL && vnode_vtype(*vpp) == VDIR) { - MPASS((cnp->cn_flags & ISDOTDOT) == 0); - MPASS(!(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')); + MPASS((cnp->cn_flags & ISDOTDOT) == 0); + MPASS(!(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')); VTOFUD(*vpp)->parent_nid = VTOI(dvp); } if (dvp != NULL && cnp != NULL && (cnp->cn_flags & MAKEENTRY) != 0) { @@ -235,7 +231,6 @@ struct fuse_filehandle *fufh = NULL; struct fuse_dispatcher fdi; struct fuse_setattr_in *fsai; - struct fuse_access_param facp; int err = 0; DEBUG("inode=%jd oldsize=%jd newsize=%jd\n", @@ -264,10 +259,6 @@ fsai = fdi.indata; fsai->valid = 0; - bzero(&facp, sizeof(facp)); - facp.xuid = cred->cr_uid; - facp.xgid = cred->cr_gid; - // Truncate to a new value. fsai->size = newsize; fsai->valid |= FATTR_SIZE; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#17 (text+ko) ==== @@ -11,7 +11,6 @@ #include "fuse_file.h" -#define FN_CREATING 0x00000002 #define FN_REVOKED 0x00000020 #define FN_FLUSHINPROG 0x00000040 #define FN_FLUSHWANT 0x00000080 @@ -28,32 +27,14 @@ struct fuse_filehandle fufh[FUFH_MAXTYPE]; /** flags **/ - /* XXX: Clean up this multi-flag nonsense. Really. */ uint32_t flag; - int flags; - uint32_t c_flag; /** meta **/ - struct timespec cached_attrs_valid; struct vattr cached_attrs; off_t filesize; uint64_t nlookup; enum vtype vtype; - - /* - * The nodelock must be held when data in the FUSE node is accessed or - * modified. Typically, we would take this lock at the beginning of a - * vnop and drop it at the end of the vnop. - */ - struct sx nodelock; - void *nodelockowner; - - /* - * The truncatelock guards against the EOF changing on us (that is, a - * file resize) unexpectedly. - */ - struct sx truncatelock; }; #define VTOFUD(vp) \ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#21 (text+ko) ==== @@ -99,10 +99,6 @@ fuse_trace_printf_vfsop(); - GIANT_REQUIRED; - KASSERT(fuse_useco >= 0, - ("negative fuse usecount despite Giant")); - if (mp->mnt_flag & MNT_UPDATE) return EOPNOTSUPP; @@ -295,8 +291,6 @@ fuse_trace_printf_vfsop(); - GIANT_REQUIRED; - if (mntflags & MNT_FORCE) { flags |= FORCECLOSE; } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#39 (text+ko) ==== @@ -81,7 +81,6 @@ static vop_getpages_t fuse_vnop_getpages; static vop_putpages_t fuse_vnop_putpages; static vop_print_t fuse_vnop_print; -static vop_unlock_t fuse_vnop_unlock; struct vop_vector fuse_vnops = { .vop_default = &default_vnodeops, @@ -111,7 +110,6 @@ .vop_getpages = fuse_vnop_getpages, .vop_putpages = fuse_vnop_putpages, .vop_print = fuse_vnop_print, - .vop_unlock = fuse_vnop_unlock, }; static u_long fuse_lookup_cache_hits = 0; @@ -164,7 +162,6 @@ struct ucred *cred = ap->a_cred; struct fuse_access_param facp; - struct fuse_vnode_data *fvdat = VTOFUD(vp); struct fuse_data *data = fuse_get_mpdata(vnode_mount(vp)); int err; @@ -194,12 +191,6 @@ bzero(&facp, sizeof(facp)); - if (fvdat->flags & FVP_ACCESS_NOOP) { - fvdat->flags &= ~FVP_ACCESS_NOOP; - } else { - facp.facc_flags |= FACCESS_DO_ACCESS; - } - err = fuse_internal_access(vp, accmode, &facp, ap->a_td, ap->a_cred); DEBUG2G("err=%d accmode=0x%x\n", err, accmode); return err; @@ -348,9 +339,6 @@ } err = fuse_vnode_get(mp, feo->nodeid, dvp, vpp, cnp, VREG, /*size*/0); - if (!err && !gone_good_old) { - VTOFUD(*vpp)->flag |= FN_CREATING; - } if (err) { if (gone_good_old) { fuse_internal_forget_send(mp, td, cred, feo->nodeid, 1, fdip); @@ -528,25 +516,7 @@ fuse_ticket_drop(fdi.tick); - if (vnode_vtype(vp) != vap->va_type) { - if ((vnode_vtype(vp) == VNON) && (vap->va_type != VNON)) { - /* - * We should be doing the following: - * - * vp->vtype = vap->v_type - */ - } else { - /* - * STALE vnode, ditch - * - * The vnode has changed its type "behind our back". There's - * nothing really we can do, so let us just force an internal - * revocation. - */ - fuse_internal_vnode_disappear(vp); - return EIO; - } - } + KASSERT(vnode_vtype(vp) == vap->va_type, ("stale vnode")); debug_printf("fuse_getattr e: returning 0\n"); @@ -1572,24 +1542,6 @@ DEBUG2G("inode=%jd\n", VTOI(vp)); - /* - * XXX: Locking - * - * We need to worry about the file size changing in setattr. If the call - * is indeed altering the size, then: - * - * lock_exclusive(truncatelock) - * lock(nodelock) - * set the new size - * unlock(nodelock) - * adjust ubc - * lock(nodelock) - * do cleanup - * unlock(nodelock) - * unlock(truncatelock) - * ... - */ - if (fuse_isdeadfs(vp)) { return EBADF; } @@ -2117,29 +2069,11 @@ { struct fuse_vnode_data *fvdat = VTOFUD(ap->a_vp); - printf("nodeid: %ju, parent_nid: %ju, " - "nlookup: %ju, flags: %#x\n", + printf("nodeid: %ju, parent nodeid: %ju, " + "nlookup: %ju, flag: %#x\n", VTOILLU(ap->a_vp), (uintmax_t) fvdat->parent_nid, (uintmax_t)fvdat->nlookup, - fvdat->flags); + fvdat->flag); return 0; } - -/* - struct vnop_unlock_args { - struct vnode *a_vp; - int a_flags; - struct thread *a_td; - }; -*/ -static int -fuse_vnop_unlock(struct vop_unlock_args *ap) -{ - struct vnode *vp = ap->a_vp; - - if (VTOFUD(vp)) - VTOFUD(vp)->flags &= ~FVP_ACCESS_NOOP; - - return vop_stdunlock(ap); -} From owner-p4-projects@FreeBSD.ORG Mon Jul 18 07:43:17 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0C5D1065675; Mon, 18 Jul 2011 07:43: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 932971065672 for ; Mon, 18 Jul 2011 07:43:17 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7FD208FC0A for ; Mon, 18 Jul 2011 07:43: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 p6I7hHkW035330 for ; Mon, 18 Jul 2011 07:43:17 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6I7hHnm035327 for perforce@freebsd.org; Mon, 18 Jul 2011 07:43:17 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 18 Jul 2011 07:43:17 GMT Message-Id: <201107180743.p6I7hHnm035327@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196334 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 Jul 2011 07:43:18 -0000 http://p4web.freebsd.org/@@196334?ac=10 Change 196334 by ilya@ilya_triton2011 on 2011/07/18 07:42:48 Add fuse_vnode_setparent Increase minimal message size to 160 bytes (macfuse) Locking fixes Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#11 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#11 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#12 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#18 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#18 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#40 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#11 (text+ko) ==== @@ -140,6 +140,7 @@ goto out; } dev->si_drv1 = NULL; + fuse_lck_mtx_unlock(data->aw_mtx); FUSE_UNLOCK(); fdata_destroy(data); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#11 (text+ko) ==== @@ -138,11 +138,13 @@ { struct fuse_ticket *ftick; - debug_printf("data=%p\n", data); + ftick = malloc(sizeof(*ftick), M_FUSEMSG, M_WAITOK | M_ZERO); - ftick = malloc(sizeof(*ftick), M_FUSEMSG, M_WAITOK | M_ZERO); + debug_printf("ftick=%p data=%p\n", ftick, data); + mtx_lock(&data->ticket_mtx); ftick->tk_unique = data->ticketer++; + mtx_unlock(&data->ticket_mtx); ftick->tk_data = data; fiov_init(&ftick->tk_ms_fiov, sizeof(struct fuse_in_header)); @@ -183,6 +185,12 @@ { debug_printf("ftick=%p\n", ftick); + KASSERT(ftick->tk_ms_link.stqe_next == NULL, + ("FUSE: destroying ticket still on message list %p", ftick)); + KASSERT(ftick->tk_aw_link.tqe_next == NULL && + ftick->tk_aw_link.tqe_prev == NULL, + ("FUSE: destroying ticket still on answer delivery list %p", ftick)); + fiov_teardown(&ftick->tk_ms_fiov); mtx_destroy(&ftick->tk_aw_mtx); @@ -225,13 +233,13 @@ } out: - fuse_lck_mtx_unlock(ftick->tk_aw_mtx); - if (!(err || fticket_answered(ftick))) { debug_printf("FUSE: requester was woken up but still no answer"); err = ENXIO; } + fuse_lck_mtx_unlock(ftick->tk_aw_mtx); + return err; } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#12 (text+ko) ==== @@ -25,7 +25,7 @@ (spc2) = (char *)(fiov)->base + (sizeof(*(spc1))); \ } while (0) -#define FU_AT_LEAST(siz) max((siz), 128) +#define FU_AT_LEAST(siz) max((siz), 160) struct fuse_ticket; struct fuse_data; @@ -79,6 +79,7 @@ fticket_answered(struct fuse_ticket *ftick) { DEBUGX(FUSE_DEBUG_IPC, "-> ftick=%p\n", ftick); + mtx_assert(&ftick->tk_aw_mtx, MA_OWNED); return (ftick->tk_flag & FT_ANSW); } @@ -87,6 +88,7 @@ fticket_set_answered(struct fuse_ticket *ftick) { DEBUGX(FUSE_DEBUG_IPC, "-> ftick=%p\n", ftick); + mtx_assert(&ftick->tk_aw_mtx, MA_OWNED); ftick->tk_flag |= FT_ANSW; } @@ -190,6 +192,7 @@ fuse_ms_push(struct fuse_ticket *ftick) { DEBUGX(FUSE_DEBUG_IPC, "-> ftick=%p\n", ftick); + mtx_assert(&ftick->tk_data->ms_mtx, MA_OWNED); STAILQ_INSERT_TAIL(&ftick->tk_data->ms_head, ftick, tk_ms_link); } @@ -200,9 +203,13 @@ struct fuse_ticket *ftick = NULL; DEBUGX(FUSE_DEBUG_IPC, "-> data=%p\n", data); + mtx_assert(&data->ms_mtx, MA_OWNED); if ((ftick = STAILQ_FIRST(&data->ms_head))) { STAILQ_REMOVE_HEAD(&data->ms_head, tk_ms_link); +#ifdef INVARIANTS + ftick->tk_ms_link.stqe_next = NULL; +#endif } return ftick; @@ -213,6 +220,7 @@ fuse_aw_push(struct fuse_ticket *ftick) { DEBUGX(FUSE_DEBUG_IPC, "-> ftick=%p\n", ftick); + mtx_assert(&ftick->tk_data->aw_mtx, MA_OWNED); TAILQ_INSERT_TAIL(&ftick->tk_data->aw_head, ftick, tk_aw_link); } @@ -222,6 +230,10 @@ { DEBUGX(FUSE_DEBUG_IPC, "-> ftick=%p\n", ftick); TAILQ_REMOVE(&ftick->tk_data->aw_head, ftick, tk_aw_link); +#ifdef INVARIANTS + ftick->tk_aw_link.tqe_next = NULL; + ftick->tk_aw_link.tqe_prev = NULL; +#endif } static __inline__ @@ -231,6 +243,7 @@ struct fuse_ticket *ftick = NULL; DEBUGX(FUSE_DEBUG_IPC, "-> data=%p\n", data); + mtx_assert(&ftick->tk_data->aw_mtx, MA_OWNED); if ((ftick = TAILQ_FIRST(&data->aw_head))) { fuse_aw_remove(ftick); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#18 (text+ko) ==== @@ -186,7 +186,7 @@ if (dvp != NULL && vnode_vtype(*vpp) == VDIR) { MPASS((cnp->cn_flags & ISDOTDOT) == 0); MPASS(!(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')); - VTOFUD(*vpp)->parent_nid = VTOI(dvp); + fuse_vnode_setparent(*vpp, dvp); } if (dvp != NULL && cnp != NULL && (cnp->cn_flags & MAKEENTRY) != 0) { ASSERT_VOP_LOCKED(*vpp, "fuse_vnode_get"); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#18 (text+ko) ==== @@ -70,6 +70,15 @@ return (fuse_mmap_enable && fuse_data_cache_enable); } +static __inline void +fuse_vnode_setparent(struct vnode *vp, struct vnode *dvp) +{ + if (vp->v_type == VDIR) { + MPASS(dvp->v_type == VDIR); + VTOFUD(vp)->parent_nid = VTOI(dvp); + } +} + int fuse_isvalid_attr(struct vnode *vp); void fuse_vnode_destroy(struct vnode *vp); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#40 (text+ko) ==== @@ -935,8 +935,7 @@ goto out; } if (vnode_vtype(vp) == VDIR) { - VTOFUD(vp)->parent_nid = VTOI(dvp); - //SETPARENT(vp, dvp); + fuse_vnode_setparent(vp, dvp); } *vpp = vp; } @@ -1455,6 +1454,7 @@ } if (tvp != NULL && tvp != fvp) { + fuse_vnode_setparent(tvp, tdvp); cache_purge(tvp); } From owner-p4-projects@FreeBSD.ORG Mon Jul 18 07:45:29 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A36911065670; Mon, 18 Jul 2011 07:45:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B0C0106566B for ; Mon, 18 Jul 2011 07:45:29 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4786E8FC0C for ; Mon, 18 Jul 2011 07:45:29 +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 p6I7jTVN035404 for ; Mon, 18 Jul 2011 07:45:29 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6I7jTqw035401 for perforce@freebsd.org; Mon, 18 Jul 2011 07:45:29 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 18 Jul 2011 07:45:29 GMT Message-Id: <201107180745.p6I7jTqw035401@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196335 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 Jul 2011 07:45:29 -0000 http://p4web.freebsd.org/@@196335?ac=10 Change 196335 by ilya@ilya_triton2011 on 2011/07/18 07:44:59 Check vnode_extend return code and if dead in bio backend read and write Return ENXIO if file system is dead. Remove DONT_TRY_HARD_PREVENT_IO_IN_VAIN hack Don't kill file system if handler not found for response Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#12 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#18 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#18 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#12 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#41 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#12 (text+ko) ==== @@ -395,9 +395,7 @@ } else { /* no callback at all! */ DEBUG("erhm, no handler for this response\n"); - - fdata_set_dead(data); - return (EINVAL); + err = EINVAL; } return (err); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#18 (text+ko) ==== @@ -105,33 +105,17 @@ /* miscellaneous */ -#define fuse_isdeadfs_nop(vp) 0 - static __inline__ int -fuse_isdeadfs_mp(struct mount *mp) +fuse_isdeadfs(struct vnode *vp) { - struct fuse_data *data = fuse_get_mpdata(mp); + struct fuse_data *data = fuse_get_mpdata(vnode_mount(vp)); return (data->dataflags & FSESS_DEAD); } static __inline__ int -fuse_isdeadfs(struct vnode *vp) -{ - return fuse_isdeadfs_mp(vnode_mount(vp)); -} - -static __inline__ -int -fuse_isdeadfs_fs(struct vnode *vp) -{ - return fuse_isdeadfs_mp(vnode_mount(vp)); -} - -static __inline__ -int fuse_iosize(struct vnode *vp) { return vp->v_mount->mnt_stat.f_iosize; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#18 (text+ko) ==== @@ -137,6 +137,11 @@ filesize = VTOFUD(vp)->filesize; do { + if (fuse_isdeadfs(vp)) { + err = ENXIO; + break; + } + lbn = uio->uio_offset / biosize; on = uio->uio_offset & (biosize - 1); @@ -337,6 +342,11 @@ * no point optimizing for something that really won't ever happen. */ do { + if (fuse_isdeadfs(vp)) { + err = ENXIO; + break; + } + lbn = uio->uio_offset / biosize; on = uio->uio_offset & (biosize-1); n = MIN((unsigned)(biosize - on), uio->uio_resid); @@ -363,7 +373,11 @@ if (bp != NULL) { long save; - fuse_vnode_extend(vp, cred, uio->uio_offset + n); + err = fuse_vnode_extend(vp, cred, uio->uio_offset + n); + if (err) { + brelse(bp); + break; + } save = bp->b_flags & B_CACHE; bcount += n; @@ -384,8 +398,12 @@ } DEBUG("getting block from OS, bcount %d\n", bcount); bp = getblk(vp, lbn, bcount, PCATCH, 0, 0); - if (uio->uio_offset + n > fvdat->filesize) { - fuse_vnode_extend(vp, cred, uio->uio_offset + n); + if (bp && uio->uio_offset + n > fvdat->filesize) { + err = fuse_vnode_extend(vp, cred, uio->uio_offset + n); + if (err) { + brelse(bp); + break; + } } } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#12 (text+ko) ==== @@ -355,14 +355,6 @@ free(data,M_FUSEMSG); } -int -fdata_get_dead(struct fuse_data *data) -{ - debug_printf("data=%p\n", data); - - return (data->dataflags & FSESS_DEAD); -} - void fdata_set_dead(struct fuse_data *data) { @@ -863,11 +855,6 @@ if ((err = fticket_wait_answer(fdip->tick))) { // interrupted -#ifndef DONT_TRY_HARD_PREVENT_IO_IN_VAIN - struct fuse_ticket *tick; - unsigned age; -#endif - debug_printf("IPC: interrupted, err = %d\n", err); fuse_lck_mtx_lock(fdip->tick->tk_aw_mtx); @@ -888,31 +875,8 @@ * to drop the ticket. */ debug_printf("IPC: setting to answered\n"); - age = fdip->tick->tk_age; fticket_set_answered(fdip->tick); fuse_lck_mtx_unlock(fdip->tick->tk_aw_mtx); -#ifndef DONT_TRY_HARD_PREVENT_IO_IN_VAIN - /* - * If we are willing to pay with one more locking, we - * can save on I/O by getting the device write handler - * to drop the ticket. That is, if we are fast enough, - * the standard handler -- who does the uiomove -- - * won't even be called. (No guarantee though for - * being fast.) - */ - fuse_lck_mtx_lock(fdip->tick->tk_data->aw_mtx); - TAILQ_FOREACH(tick, &fdip->tick->tk_data->aw_head, tk_aw_link) { - if (tick == fdip->tick) { - if (fdip->tick->tk_age == age) { - debug_printf("IPC: preventing io in vain succeeded\n"); - fdip->tick->tk_aw_handler = NULL; - } - break; - } - } - - fuse_lck_mtx_unlock(fdip->tick->tk_data->aw_mtx); -#endif return err; } } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#13 (text+ko) ==== @@ -268,9 +268,15 @@ struct fuse_data *fdata_alloc(struct cdev *dev, struct ucred *cred); void fdata_destroy(struct fuse_data *data); -int fdata_get_dead(struct fuse_data *data); void fdata_set_dead(struct fuse_data *data); +static __inline__ +int +fdata_get_dead(struct fuse_data *data) +{ + return (data->dataflags & FSESS_DEAD); +} + struct fuse_dispatcher { struct fuse_ticket *tick; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#41 (text+ko) ==== @@ -172,7 +172,7 @@ if (vnode_isvroot(vp)) { return 0; } - return EBADF; + return ENXIO; } if (!(data->dataflags & FSESS_INITED)) { @@ -274,7 +274,7 @@ fuse_trace_printf_vnop(); - if (fuse_isdeadfs_fs(dvp)) { + if (fuse_isdeadfs(dvp)) { panic("FUSE: fuse_vnop_create(): called on a dead file system"); } @@ -591,7 +591,7 @@ fuse_trace_printf_vnop(); - if (fuse_isdeadfs_fs(vp)) { + if (fuse_isdeadfs(vp)) { panic("FUSE: fuse_vnop_link(): called on a dead file system"); } @@ -1069,7 +1069,7 @@ fuse_trace_printf_vnop(); - if (fuse_isdeadfs_fs(dvp)) { + if (fuse_isdeadfs(dvp)) { panic("FUSE: fuse_vnop_mkdir(): called on a dead file system"); } @@ -1107,8 +1107,8 @@ fuse_trace_printf_vnop(); - if (fuse_isdeadfs_fs(dvp)) { - panic("fuse_vnop_mknod(): called on a dead file system"); + if (fuse_isdeadfs(dvp)) { + panic("FUSE: fuse_vnop_mknod(): called on a dead file system"); } fmni.mode = MAKEIMODE(vap->va_type, vap->va_mode); @@ -1195,7 +1195,7 @@ VTOI(vp), uio->uio_offset, uio->uio_resid); if (fuse_isdeadfs(vp)) { - return EIO; + return ENXIO; } return fuse_io_dispatch(vp, uio, ioflag, cred); @@ -1228,7 +1228,7 @@ DEBUG2G("inode=%jd\n", VTOI(vp)); if (fuse_isdeadfs(vp)) { - return EBADF; + return ENXIO; } if ( /* XXXIP ((uio_iovcnt(uio) > 1)) || */ @@ -1285,7 +1285,7 @@ DEBUG2G("inode=%jd\n", VTOI(vp)); if (fuse_isdeadfs(vp)) { - return EBADF; + return ENXIO; } if (!vnode_islnk(vp)) { @@ -1378,7 +1378,7 @@ DEBUG2G("inode=%jd name=%*s\n", VTOI(vp), (int)cnp->cn_namelen, cnp->cn_nameptr); - if (fuse_isdeadfs_fs(vp)) { + if (fuse_isdeadfs(vp)) { panic("FUSE: fuse_vnop_remove(): called on a dead file system"); } @@ -1425,7 +1425,7 @@ (tvp == NULL ? (intmax_t)-1 : VTOI(tvp)), (int)tcnp->cn_namelen, tcnp->cn_nameptr); - if (fuse_isdeadfs_fs(fdvp)) { + if (fuse_isdeadfs(fdvp)) { panic("FUSE: fuse_vnop_rename(): called on a dead file system"); } @@ -1497,7 +1497,7 @@ DEBUG2G("inode=%jd\n", VTOI(vp)); - if (fuse_isdeadfs_fs(vp)) { + if (fuse_isdeadfs(vp)) { panic("FUSE: fuse_vnop_rmdir(): called on a dead file system"); } @@ -1543,7 +1543,7 @@ DEBUG2G("inode=%jd\n", VTOI(vp)); if (fuse_isdeadfs(vp)) { - return EBADF; + return ENXIO; } fdisp_init(&fdi, sizeof(*fsai)); @@ -1688,9 +1688,9 @@ if (!vp || fuse_isdeadfs(vp)) { bp->b_ioflags |= BIO_ERROR; - bp->b_error = EIO; + bp->b_error = ENXIO; bufdone(bp); - return EIO; + return ENXIO; } if (bp->b_iocmd == BIO_WRITE) @@ -1735,7 +1735,7 @@ DEBUG2G("inode=%jd name=%*s\n", VTOI(dvp), (int)cnp->cn_namelen, cnp->cn_nameptr); - if (fuse_isdeadfs_fs(dvp)) { + if (fuse_isdeadfs(dvp)) { panic("FUSE: fuse_vnop_symlink(): called on a dead file system"); } @@ -1783,7 +1783,7 @@ fuse_trace_printf_vnop(); if (fuse_isdeadfs(vp)) { - return EIO; + return ENXIO; } fuse_vnode_refreshsize(vp, cred); From owner-p4-projects@FreeBSD.ORG Mon Jul 18 09:43:53 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D40AE1065674; Mon, 18 Jul 2011 09:43:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CAF6106564A for ; Mon, 18 Jul 2011 09:43:52 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 792068FC0C for ; Mon, 18 Jul 2011 09:43:52 +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 p6I9hqE1059756 for ; Mon, 18 Jul 2011 09:43:52 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6I9hqNK059753 for perforce@freebsd.org; Mon, 18 Jul 2011 09:43:52 GMT (envelope-from cnicutar@freebsd.org) Date: Mon, 18 Jul 2011 09:43:52 GMT Message-Id: <201107180943.p6I9hqNK059753@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196341 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 Jul 2011 09:43:53 -0000 http://p4web.freebsd.org/@@196341?ac=10 Change 196341 by cnicutar@cnicutar_cronos on 2011/07/18 09:43:02 Add TCP UTO support to telnet and telnetd. Currently it only works if the client uses the Authentication option. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/commands.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/externs.h#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/main.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/telnet.1#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/telnet.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnetd/telnetd.8#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnetd/telnetd.c#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/commands.c#2 (text+ko) ==== @@ -78,6 +78,7 @@ #include #include #include +#include #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 256 @@ -2442,6 +2443,9 @@ goto fail; } #endif + if (uto && setsockopt(net, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, &uto, + sizeof(uto))) + perror("setsockopt UTO"); if (connect(net, res->ai_addr, res->ai_addrlen) < 0) { struct addrinfo *next; ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/externs.h#2 (text+ko) ==== @@ -129,6 +129,7 @@ termdata, /* Print out terminal data flow */ telnet_debug, /* Debug level */ doaddrlookup, /* do a reverse lookup? */ + uto, /* Request User Timeout. */ clienteof; /* Client received EOF */ extern cc_t escape; /* Escape to command mode */ ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/main.c#2 (text+ko) ==== @@ -97,7 +97,7 @@ "[-4] [-6] [-8] [-E] [-L] [-N] [-S tos] [-c] [-d]", "\n\t[-e char] [-l user] [-n tracefile] ", #endif - "[-r] [-s src_addr] [-u] ", + "[-r] [-s src_addr] [-t timeout] [-u] ", #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) "[-P policy] " #endif @@ -154,7 +154,7 @@ #define IPSECOPT #endif while ((ch = getopt(argc, argv, - "468EKLNS:X:acde:fFk:l:n:rs:uxy" IPSECOPT)) != -1) + "468EKLNS:X:acde:fFk:l:n:rs:ut:xy" IPSECOPT)) != -1) #undef IPSECOPT { switch(ch) { @@ -303,6 +303,9 @@ case 's': src_addr = optarg; break; + case 't': + uto = strtonum(optarg, 0, INT_MAX, NULL); + break; case 'u': family = AF_UNIX; break; ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/telnet.1#2 (text+ko) ==== @@ -50,6 +50,7 @@ .Op Fl l Ar user .Op Fl n Ar tracefile .Op Fl s Ar src_addr +.Op Fl t Ar timeout .Oo .Ar host .Op Ar port @@ -203,6 +204,14 @@ connection to .Ar src_addr , which can be an IP address or a host name. +.It Fl t Ar timeout +Sets the requested timeout (UTO) for the connection. +If the server accepts this value, the connection will be kept for +.Ar timeout +seconds in the absence of network connectivity. +.Pp +This is server-dependent, but usually it only works with authentication, +for security reasons. .It Fl u Forces .Nm ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/telnet.c#2 (text+ko) ==== @@ -112,6 +112,7 @@ dontlecho, /* do we suppress local echoing right now? */ globalmode, doaddrlookup = 1, /* do a reverse address lookup? */ + uto = 0, /* Request User Timeout. */ clienteof = 0; char *prompt = 0; ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnetd/telnetd.8#2 (text+ko) ==== @@ -42,7 +42,7 @@ protocol server .Sh SYNOPSIS .Nm /usr/libexec/telnetd -.Op Fl 46BUhlkn +.Op Fl 46BUhlknt .Op Fl D Ar debugmode .Op Fl S Ar tos .Op Fl X Ar authtype @@ -263,6 +263,14 @@ TOS name found in the .Pa /etc/iptos file. +.It Fl t +Accepts UTO (User Timeout) suggestion from client. +Normally a TCP connection is dropped if data is not acknowledged for a period +of time. +A client may influnce this period by advertising a timeout value. +.Pp +The value sent by the client is only accepted after successful authentication, +for security reasons. .It Fl u Ar len This option is used to specify the size of the field in the ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnetd/telnetd.c#2 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include +#include /* For UTO. */ #ifdef AUTHENTICATION #include @@ -81,6 +82,7 @@ static int debug = 0; int keepalive = 1; const char *altlogin; +int uto = 0; /* Accept advertised timeout. */ void doit(struct sockaddr *); int terminaltypeok(char *); @@ -94,7 +96,7 @@ * passed off to getopt(). */ char valid_opts[] = { - 'd', ':', 'h', 'k', 'n', 'p', ':', 'S', ':', 'u', ':', 'U', + 'd', ':', 'h', 'k', 'n', 'p', ':', 'S', ':', 't', 'u', ':', 'U', '4', '6', #ifdef AUTHENTICATION 'a', ':', 'X', ':', @@ -286,6 +288,11 @@ #endif break; + case 't': + /* Enable TCP_RCVUTO_TIMEOUT after authentication.*/ + uto = 1; + break; + case 'u': utmp_len = (size_t)atoi(optarg); if (utmp_len >= sizeof(remote_hostname)) @@ -446,6 +453,7 @@ #ifdef HAS_GETTOS fprintf(stderr, " [-S tos]"); #endif + fprintf(stderr, " [-t]"); #ifdef AUTHENTICATION fprintf(stderr, " [-X auth-type]"); #endif @@ -933,6 +941,11 @@ DIAG(TD_REPORT, output_data("td: Entering processing loop\r\n")); + /* If authenticated we'll accept the received UTO. */ + if (uto && level && setsockopt(net, IPPROTO_TCP, TCP_RCVUTO_TIMEOUT, &uto, + sizeof(uto))) + perror("setsockopt UTO"); + /* * Startup the login process on the slave side of the terminal * now. We delay this until here to insure option negotiation From owner-p4-projects@FreeBSD.ORG Mon Jul 18 21:16:45 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C79E1065670; Mon, 18 Jul 2011 21:16:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1ED88106564A for ; Mon, 18 Jul 2011 21:16:45 +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 0C5D18FC15 for ; Mon, 18 Jul 2011 21:16:45 +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 p6ILGihY000244 for ; Mon, 18 Jul 2011 21:16:44 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6ILGiqi000241 for perforce@freebsd.org; Mon, 18 Jul 2011 21:16:44 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 18 Jul 2011 21:16:44 GMT Message-Id: <201107182116.p6ILGiqi000241@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 196369 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 Jul 2011 21:16:45 -0000 http://p4web.freebsd.org/@@196369?ac=10 Change 196369 by rene@rene_acer on 2011/07/18 21:15:39 Some more of network-servers translated. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#43 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#43 (text+ko) ==== @@ -4279,14 +4279,131 @@ role="Zone Signing Key">ZSK). Meer over de verschillende soorten sleutels komt aan bod in . - + + Nu moet de sleutel gecontroleerd en geformatteerd worden zodat + BIND deze kan gebruiken. Maak om de sleutel te + controleren een DS - + RR-paar aan. Maak een + bestand aan dat deze RRs + bevat aan met + + &prompt.user; dnssec-dsfromkey -f root-dnskey . > root.ds + + Deze records gebruiken respectievelijk SHA-1 en SHA-256, en dienen + er als het volgende voorbeeld uit te zien, waarbij het langere record + SHA-256 gebruikt. + + . IN DS 19036 8 1 B256BD09DC8DD59F0E0F0D8541B8328DD986DF6E +. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5 + + Het SHA-256 RR kan nu worden vergeleken met de + digest in https://data.iana.org/root-anchors/root-anchors.xml. + Om er absoluut zeker van te zijn dat er niet geknoeid is met de + sleutel kunnen de gegevens in het XML-bestand + worden gecontroleerd met de PGP-handtekening in + https//data.iana.org/root-anchors/root-anchors.asc. + + Vervolgens dient de sleutel juist geformateerd te worden. Dit + verschilt een beetje tussen versie 9.6.2 en versie 9.7 en later van + BIND. In versie 9.7 is ondersteuning toegevoegd om + automatisch veranderingen aan de sleutel te volgen en deze bij te + werken indien nodig. Dit wordt gedaan met + managed-keys zoals in het volgende voorbeeld te + zien is. Als de oudere versie gebruikt wordt, wordt de sleutel + toevoegd met een commando trusted-keys en dient + deze handmatig bijgewerkt te worden. Voor BIND + 9.6.2 ziet het formaat er uit als: + + trusted-keys { + "." 257 3 8 + "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF + FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX + bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD + X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz + W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS + Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq + QxA+Uk1ihz0="; +}; + + Voor versie 9.7 ziet het formaat er echter zo uit: + + managed-keys { + "." initial-key 257 3 8 + "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF + FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX + bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD + X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz + W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS + Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq + QxA+Uk1ihz0="; +}; + + De root-sleutel kan nu aan named.conf worden + toegevoegd, ofwel direct of door een bestand dat de sleutel bevat te + includen. Stel na deze stappen BIND in zodat het + DNSSEC-validatie uitvoert op queries door + named.conf te bewerken en het volgende aan de + directief options toe te voegen: + + dnssec-enable yes; +dnssec-validation yes; + + Om te controleren dat het ook echt werkt, kan + dig gebruikt worden om een query op een + ondertekende zone uit te voeren met de zojuist geconfigureerde + resolver. Een succesvol antwoord zal de vlag AD + bevatten om aan te geven dat de gegevens zijn geautenticeerd. Een + query als + + &prompt.user; dig @resolver +dnssec se ds + + zou het DS RR paar voor de + .se-zone moeten teruggeven. In de sectie + flags: moet de vlag AD te zien + zijn, als in: + + ... +;; flags: qr rd ra ad; QUERY: 1, ANSWER: 3, AUTHORITY: 0, ADDITIONAL: 1 +... + + De resolver is nu in staat om DNS-queries te + autenticeren. - Configuratie van een autoratieve <acronym>DNS</acronym>-server - + + Om een autoratieve naamserver een met DNSSEC + ondertekende zone te laten serveren is wat meer werk nodig. Een zone + wordt ondertekend met cryptografische sleutels die aangemaakt moeten + worden. Het is mogelijk om hier slechts één sleutel + voor te gebruiken. De methode die de voorkeur verdient is echter om + een sterke, goed beschermde Key Signing Key (KSK) die niet vaak wordt geroteerd + en een Zone Signing Key (ZSK) die vaker wordt geroteerd te + hebben. Informatie over aanbevolen procedures staat in RFC + 4641: DNSSEC Operational Practices. + Procedures betreffende de rootzone staan in DNSSEC + Practice Statement for the Root Zone KSK + operator en DNSSEC + Practice Statement for the Root Zone ZSK + operator. De KSK + wordt gebruikt om een autoriteitsketen voor de te valideren gegevens + op te bouwen en wordt daarom ook een Secure Entry Point (SEP)-sleutel genoemd. Een + message digest van deze sleutel, dat Delegation Signer (DS)-record genoemd wordt, moet + gepubliceerd zijn in de ouderzone om een vertrouwensketen op te + bouwen. Hoe dit bereikt wordt hangt af van de eigenaar van de + ouderzone. De ZSK wordt + gebruikt om de zone te ondertekenen, en hoeft alleen daar gepubliceerd + te worden. + From owner-p4-projects@FreeBSD.ORG Tue Jul 19 10:31:07 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F18A61065672; Tue, 19 Jul 2011 10:31:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FB3A1065670 for ; Tue, 19 Jul 2011 10:31:06 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7DF8C8FC12 for ; Tue, 19 Jul 2011 10:31:06 +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 p6JAV6lW059395 for ; Tue, 19 Jul 2011 10:31:06 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JAV6u9059391 for perforce@freebsd.org; Tue, 19 Jul 2011 10:31:06 GMT (envelope-from cnicutar@freebsd.org) Date: Tue, 19 Jul 2011 10:31:06 GMT Message-Id: <201107191031.p6JAV6u9059391@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196388 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 Jul 2011 10:31:07 -0000 http://p4web.freebsd.org/@@196388?ac=10 Change 196388 by cnicutar@cnicutar_cronos on 2011/07/19 10:30:05 Add TCP UTO support to netcat. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/netcat/nc.1#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/netcat/netcat.c#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/netcat/nc.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" .\" $FreeBSD: src/contrib/netcat/nc.1,v 1.14.2.6 2010/11/18 01:14:18 delphij Exp $ .\" -.Dd July 25, 2010 +.Dd July 19, 2011 .Dt NC 1 .Os .Sh NAME @@ -173,6 +173,9 @@ Specifies that source and/or destination ports should be chosen randomly instead of sequentially within a range or in the order that the system assigns them. +.It Fl -rcv-uto +Specifies that the UTO value sent by the peer should be accepted when TCP +computes the local User Timeout. .It Fl S Enables the RFC 2385 TCP MD5 signature option. .It Fl s Ar source_ip_address @@ -224,6 +227,9 @@ .Fl w flag. The default is no timeout. +.Tf +This timeout also controls the User Timeout advertised to the peer by +TCP. .It Fl X Ar proxy_protocol Requests that .Nm ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/netcat/netcat.c#2 (text+ko) ==== @@ -82,6 +82,7 @@ char *Pflag; /* Proxy username */ char *pflag; /* Localport flag */ int rflag; /* Random ports flag */ +int utoflag; /* Accept peer UTO. */ char *sflag; /* Source Address */ int tflag; /* Telnet Emulation */ int uflag; /* UDP - Default to TCP */ @@ -136,6 +137,7 @@ struct addrinfo proxyhints; struct option longopts[] = { { "no-tcpopt", no_argument, &FreeBSD_Oflag, 1 }, + { "rcv-uto", no_argument, &utoflag, 1 }, { NULL, 0, NULL, 0 } }; @@ -246,7 +248,6 @@ timeout = strtonum(optarg, 0, INT_MAX / 1000, &errstr); if (errstr) errx(1, "timeout %s: %s", errstr, optarg); - timeout *= 1000; break; case 'x': xflag = 1; @@ -279,6 +280,9 @@ case 'T': Tflag = parse_iptos(optarg); break; + case 0: + /* getopt_long returns 0 for --long-options. */ + break; default: usage(1); } @@ -698,7 +702,7 @@ if (iflag) sleep(iflag); - if ((n = poll(pfd, 2 - dflag, timeout)) < 0) { + if ((n = poll(pfd, 2 - dflag, timeout * 1000)) < 0) { close(nfd); err(1, "Polling Error"); } @@ -894,6 +898,19 @@ &FreeBSD_Oflag, sizeof(FreeBSD_Oflag)) == -1) err(1, "disable TCP options"); } + /* + * Try to set the sent timeout but don't die on error. The timeout + * option was here before UTO so this would break existing + * applications on systems where UTO is disabled. + */ + if (timeout > 0 && setsockopt(s, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, + &timeout, sizeof(timeout))) + perror("setsokopt send TCP UTO"); + + /* Set the disposition to accept the timeout of the peer. */ + if (utoflag && setsockopt(s, IPPROTO_TCP, TCP_RCVUTO_TIMEOUT, + &utoflag, sizeof(utoflag))) + err(1, "setsokopt receive TCP UTO"); } int @@ -939,6 +956,7 @@ \t-P proxyuser\tUsername for proxy authentication\n\ \t-p port\t Specify local port for remote connects\n\ \t-r Randomize remote ports\n\ + \t--rcv-uto Accept peer User Timeout\n\ \t-S Enable the TCP MD5 signature option\n\ \t-s addr\t Local source address\n\ \t-T ToS\t Set IP Type of Service\n\ From owner-p4-projects@FreeBSD.ORG Tue Jul 19 10:40:59 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77A041065670; Tue, 19 Jul 2011 10:40:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39C03106564A for ; Tue, 19 Jul 2011 10:40:59 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 26C598FC0C for ; Tue, 19 Jul 2011 10:40:59 +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 p6JAexZF062091 for ; Tue, 19 Jul 2011 10:40:59 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JAew0T062086 for perforce@freebsd.org; Tue, 19 Jul 2011 10:40:59 GMT (envelope-from cnicutar@freebsd.org) Date: Tue, 19 Jul 2011 10:40:59 GMT Message-Id: <201107191040.p6JAew0T062086@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196390 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 Jul 2011 10:40:59 -0000 http://p4web.freebsd.org/@@196390?ac=10 Change 196390 by cnicutar@cnicutar_cronos on 2011/07/19 10:40:36 Add TCP UTO support to ssh and sshd. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/readconf.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/readconf.h#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/servconf.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/servconf.h#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/ssh.1#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/ssh.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/ssh_config.5#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/sshconnect.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/sshd.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/sshd_config.5#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/readconf.c#2 (text+ko) ==== @@ -134,7 +134,7 @@ oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, - oVersionAddendum, + oVersionAddendum, oUserTimeout, oDeprecated, oUnsupported } OpCodes; @@ -222,6 +222,7 @@ { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost }, { "rekeylimit", oRekeyLimit }, { "connecttimeout", oConnectTimeout }, + { "usertimeout", oUserTimeout }, { "addressfamily", oAddressFamily }, { "serveraliveinterval", oServerAliveInterval }, { "serveralivecountmax", oServerAliveCountMax }, @@ -396,6 +397,10 @@ *intptr = value; break; + case oUserTimeout: + intptr = &options->user_timeout; + goto parse_time; + case oForwardAgent: intptr = &options->forward_agent; parse_flag: @@ -1055,6 +1060,7 @@ options->address_family = -1; options->connection_attempts = -1; options->connection_timeout = -1; + options->user_timeout = -1; options->number_of_password_prompts = -1; options->cipher = -1; options->ciphers = NULL; ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/readconf.h#2 (text+ko) ==== @@ -65,6 +65,7 @@ * giving up */ int connection_timeout; /* Max time (seconds) before * aborting connection attempt */ + int user_timeout; /* Timeout value (seconds) sent to server. */ int number_of_password_prompts; /* Max number of password * prompts. */ int cipher; /* Cipher to use. */ ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/servconf.c#2 (text+ko) ==== @@ -105,6 +105,7 @@ options->compression = -1; options->allow_tcp_forwarding = -1; options->allow_agent_forwarding = -1; + options->allow_user_timeout = -1; options->num_allow_users = 0; options->num_deny_users = 0; options->num_allow_groups = 0; @@ -310,7 +311,7 @@ sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, + sUsePrivilegeSeparation, sAllowAgentForwarding, sAllowUserTimeout, sZeroKnowledgePasswordAuthentication, sHostCertificate, sRevokedKeys, sTrustedUserCAKeys, sVersionAddendum, @@ -405,6 +406,7 @@ { "keepalive", sTCPKeepAlive, SSHCFG_GLOBAL }, /* obsolete alias */ { "allowtcpforwarding", sAllowTcpForwarding, SSHCFG_ALL }, { "allowagentforwarding", sAllowAgentForwarding, SSHCFG_ALL }, + { "allowusertimeout", sAllowUserTimeout, SSHCFG_ALL }, { "allowusers", sAllowUsers, SSHCFG_GLOBAL }, { "denyusers", sDenyUsers, SSHCFG_GLOBAL }, { "allowgroups", sAllowGroups, SSHCFG_GLOBAL }, @@ -1066,6 +1068,10 @@ case sAllowAgentForwarding: intptr = &options->allow_agent_forwarding; goto parse_flag; + + case sAllowUserTimeout: + intptr = &options->allow_user_timeout; + goto parse_flag; case sUsePrivilegeSeparation: intptr = &use_privsep; ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/servconf.h#2 (text+ko) ==== @@ -108,6 +108,7 @@ int compression; /* If true, compression is allowed */ int allow_tcp_forwarding; int allow_agent_forwarding; + int allow_user_timeout; /* Accept the client timeout if true. */ u_int num_allow_users; char *allow_users[MAX_ALLOW_USERS]; u_int num_deny_users; ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/ssh.1#2 (text+ko) ==== @@ -36,7 +36,7 @@ .\" .\" $OpenBSD: ssh.1,v 1.302 2010/03/05 10:28:21 djm Exp $ .\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.38.2.3 2010/06/02 10:28:26 des Exp $ -.Dd March 5, 2010 +.Dd July 19, 2011 .Dt SSH 1 .Os .Sh NAME @@ -79,6 +79,7 @@ .Sm on .Oc .Op Fl S Ar ctl_path +.Op Fl u Ar timeout .Op Fl W Ar host : Ns Ar port .Oo Fl w Ar local_tun Ns .Op : Ns Ar remote_tun Oc @@ -493,6 +494,7 @@ .It TunnelDevice .It UsePrivilegedPort .It User +.It UserTimeout .It UserKnownHostsFile .It VerifyHostKeyDNS .It VersionAddendum @@ -586,6 +588,14 @@ options force tty allocation, even if .Nm has no local tty. +.It Fl u Ar timeout +Sets the requested timeout (UTO) for the connection. +If the option is accepted by the server, the connection will be kept for +the specified time in the absence of network connectivity. +.Pp +This option can also be enabled using the UserTimeout directive as described +in +.Xr ssh_config 5 . .It Fl V Display the version number and exit. .It Fl v ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/ssh.c#2 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include +#include #include #include @@ -192,7 +193,7 @@ " [-L [bind_address:]port:host:hostport]\n" " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" " [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" -" [-W host:port] [-w local_tun[:remote_tun]]\n" +" [-u timeout] [-W host:port] [-w local_tun[:remote_tun]]\n" " [user@]hostname [command]\n" ); exit(255); @@ -282,7 +283,7 @@ argv0 = av[0]; again: - while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" + while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstu:vx" "ACD:F:I:KL:MNO:PR:S:TVw:W:XYy")) != -1) { switch (opt) { case '1': @@ -375,6 +376,11 @@ force_tty_flag = 1; tty_flag = 1; break; + case 'u': + options.user_timeout = convtime(optarg); + if (options.user_timeout == -1) + fatal("Invalid User Timeout value"); + break; case 'v': if (debug_flag == 0) { debug_flag = 1; @@ -844,6 +850,15 @@ /* Log into the remote system. Never returns if the login fails. */ ssh_login(&sensitive_data, host, (struct sockaddr *)&hostaddr, pw, timeout_ms); + + /* + * Attempt to send the option after authenticating. If the server + * didn't record it at SYN, it should now. + */ + if (options.user_timeout && setsockopt(packet_get_connection_in(), + IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, &options.user_timeout, + sizeof(options.user_timeout))) + error("setsockopt TCP_SNDUTO_TIMEOUT: %.100s", strerror(errno)); /* We no longer need the private host keys. Clear them now. */ if (sensitive_data.nkeys != 0) { ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/ssh_config.5#2 (text+ko) ==== @@ -36,7 +36,7 @@ .\" .\" $OpenBSD: ssh_config.5,v 1.129 2010/03/05 10:28:21 djm Exp $ .\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.26.2.3 2010/06/02 10:28:26 des Exp $ -.Dd March 5, 2010 +.Dd July 19, 2011 .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1051,6 +1051,20 @@ This can be useful when a different user name is used on different machines. This saves the trouble of having to remember to give the user name on the command line. +.It Cm UserTimeout +Specifies the UserTimeout (TCP UTO) for this connection. +If the server accepts this option, the connection will be kept for the +specified time in the absence of network connectivity. +.Pp +Usually a server will only allow certain users to use this option, due to +the security risks involved. +.Pp +The values that can be specified are subject to +.Dv net.inet.tcp.uto.min_timeout +and +.Dv net.inet.tcp.uto.max_timeout . +.Pp +By default no timeout is used. .It Cm UserKnownHostsFile Specifies a file to use for the user host key database instead of ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/sshconnect.c#2 (text+ko) ==== @@ -25,6 +25,7 @@ #endif #include +#include #include #include @@ -375,6 +376,17 @@ /* Any error is already output */ continue; + /* + * Attempt to set the UTO value before connecting. + * Some hosts might not accept it if we send it later. + */ + if (options.user_timeout > 0 && + setsockopt(sock, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, + &options.user_timeout, + sizeof(options.user_timeout)) < 0) + error("setsockopt TCP_SNDUTO_TIMEOUT: %.100s", + strerror(errno)); + if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen, timeout_ms) >= 0) { /* Successful connection. */ ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/sshd.c#2 (text+ko) ==== @@ -59,6 +59,8 @@ #include "openbsd-compat/sys-queue.h" #include +#include + #include #include #include @@ -2015,6 +2017,17 @@ startup_pipe = -1; } + /* + * After authentication it's safe to enable User Timeout. The + * connection will not be dropped for this period of time even if + * the client stays silent (doesn't ACK our data). + */ + if (options.allow_user_timeout && packet_connection_is_on_socket() && + setsockopt(sock_in, IPPROTO_TCP, TCP_RCVUTO_TIMEOUT, &on, + sizeof(on)) < 0) + error("setsockopt TCP_RCVUTO_TIMEOUT: %.100s", strerror(errno)); + + #ifdef SSH_AUDIT_EVENTS audit_event(SSH_AUTH_SUCCESS); #endif ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/crypto/openssh/sshd_config.5#2 (text+ko) ==== @@ -36,7 +36,7 @@ .\" .\" $OpenBSD: sshd_config.5,v 1.120 2010/03/04 23:17:25 djm Exp $ .\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.32.2.3 2010/06/02 10:28:26 des Exp $ -.Dd March 4, 2010 +.Dd July 19, 2011 .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -153,6 +153,22 @@ in .Xr ssh_config 5 for more information on patterns. +.It Cm AllowUserTimeout +This directive specifies that the UserTimeout requested by the client will +be accepted after authentication. +When a UserTimeout is accepted TCP will not drop the connection for the +specified time even if the client remains silent (doesn't ACK data). +.Pp +The values that can be accepted are subject to the system-wide +.Dv net.inet.tcp.uto.min_timeout +and +.Dv net.inet.tcp.uto.max_timeout . +.Pp +A server should only allow trusted users to use this option, due to +the security risks involved. +.Pp +The default value is +.Dq no . .It Cm AuthorizedKeysFile Specifies the file that contains the public keys that can be used for user authentication. From owner-p4-projects@FreeBSD.ORG Tue Jul 19 11:01:51 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E44BB1065673; Tue, 19 Jul 2011 11:01:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6D24106566B for ; Tue, 19 Jul 2011 11:01:50 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 957348FC17 for ; Tue, 19 Jul 2011 11:01:50 +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 p6JB1oDQ065923 for ; Tue, 19 Jul 2011 11:01:50 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JB1oju065920 for perforce@freebsd.org; Tue, 19 Jul 2011 11:01:50 GMT (envelope-from syuu@FreeBSD.org) Date: Tue, 19 Jul 2011 11:01:50 GMT Message-Id: <201107191101.p6JB1oju065920@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196391 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 Jul 2011 11:01:51 -0000 http://p4web.freebsd.org/@@196391?ac=10 Change 196391 by syuu@kikurage on 2011/07/19 11:01:24 remove debug logging/dtrace probe Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#4 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -53,7 +52,6 @@ #include #ifdef SOFTRSS -#include #include #include #include @@ -182,10 +180,6 @@ static void softrss_set_flowid(struct mbuf *m); #endif -SDT_PROVIDER_DECLARE(rss); -SDT_PROVIDER_DEFINE(rss); -SDT_PROBE_DEFINE2(rss, functions, rss_m2cpuid, entry, entry, "uint32_t", "uint32_t"); - static void rss_init(__unused void *arg) { @@ -437,20 +431,16 @@ case M_HASHTYPE_RSS_TCP_IPV4: *cpuid = rss_getcpu(rss_getbucket(m->m_pkthdr.flowid)); #ifdef SOFTRSS - log(LOG_DEBUG, "%s SOFTRSS set rxqid:%d\n", __func__, *cpuid); m->m_pkthdr.rxqid = *cpuid; m->m_pkthdr.txqid = (uint32_t)-1; - SDT_PROBE2(rss, functions, rss_m2cpuid, entry, m->m_pkthdr.rxqid, m->m_pkthdr.txqid); #endif return (m); default: *cpuid = NETISR_CPUID_NONE; #ifdef SOFTRSS - log(LOG_DEBUG, "%s SOFTRSS set rxqid:%d\n", __func__, *cpuid); m->m_pkthdr.rxqid = curcpu; m->m_pkthdr.txqid = (uint32_t)-1; - SDT_PROBE2(rss, functions, rss_m2cpuid, entry, m->m_pkthdr.rxqid, m->m_pkthdr.txqid); #endif return (m); } From owner-p4-projects@FreeBSD.ORG Tue Jul 19 11:20:28 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26DB91065675; Tue, 19 Jul 2011 11:20:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE6911065673 for ; Tue, 19 Jul 2011 11:20:27 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CD12E8FC13 for ; Tue, 19 Jul 2011 11:20:27 +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 p6JBKR7X069123 for ; Tue, 19 Jul 2011 11:20:27 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JBKRjk069119 for perforce@freebsd.org; Tue, 19 Jul 2011 11:20:27 GMT (envelope-from syuu@FreeBSD.org) Date: Tue, 19 Jul 2011 11:20:27 GMT Message-Id: <201107191120.p6JBKRjk069119@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196392 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 Jul 2011 11:20:28 -0000 http://p4web.freebsd.org/@@196392?ac=10 Change 196392 by syuu@kikurage on 2011/07/19 11:19:28 Define RSSTYPE on header. Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#10 edit .. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.h#2 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#10 (text+ko) ==== @@ -4503,20 +4503,21 @@ rxr->fmp->m_pkthdr.flowid = rss; rxr->fmp->m_flags |= M_FLOWID; switch (rsstype) { - case 1: + case IGB_HASH_TCP_IPV4: M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV4); break; - case 2: - case 7: + case IGB_HASH_IPV4: + case IGB_HASH_UDP_IPV4: M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_IPV4); break; - case 3: - case 6: + case IGB_HASH_TCP_IPV6: + case IGB_HASH_TCP_IPV6_EX: M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV6); break; - case 4: - case 8: - case 9: + case IGB_HASH_IPV6: + case IGB_HASH_IPV6_EX: + case IGB_HASH_UDP_IPV6: + case IGB_HASH_UDP_IPV6_EX: M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_IPV6); break; default: ==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.h#2 (text+ko) ==== @@ -536,6 +536,15 @@ } #endif +#define IGB_HASH_NONE 0x0 +#define IGB_HASH_TCP_IPV4 0x1 +#define IGB_HASH_IPV4 0x2 +#define IGB_HASH_TCP_IPV6 0x3 +#define IGB_HASH_IPV6_EX 0x4 +#define IGB_HASH_IPV6 0x5 +#define IGB_HASH_TCP_IPV6_EX 0x6 +#define IGB_HASH_UDP_IPV4 0x7 +#define IGB_HASH_UDP_IPV6 0x8 +#define IGB_HASH_UDP_IPV6_EX 0x9 + #endif /* _IGB_H_DEFINED_ */ - - From owner-p4-projects@FreeBSD.ORG Tue Jul 19 12:04:21 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AEED1065677; Tue, 19 Jul 2011 12:04:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CD481065675 for ; Tue, 19 Jul 2011 12:04:21 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2B7D28FC12 for ; Tue, 19 Jul 2011 12:04:21 +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 p6JC4L2f077822 for ; Tue, 19 Jul 2011 12:04:21 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JC4LBr077819 for perforce@freebsd.org; Tue, 19 Jul 2011 12:04:21 GMT (envelope-from syuu@FreeBSD.org) Date: Tue, 19 Jul 2011 12:04:21 GMT Message-Id: <201107191204.p6JC4LBr077819@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196395 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 Jul 2011 12:04:21 -0000 http://p4web.freebsd.org/@@196395?ac=10 Change 196395 by syuu@kikurage on 2011/07/19 12:03:38 follow style(9). Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#11 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#7 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#11 (text+ko) ==== @@ -5623,24 +5623,24 @@ igb_get_rxqueue_len(struct ifnet *ifp) { struct adapter *adapter = ifp->if_softc; - return adapter->num_queues; + return (adapter->num_queues); } static int igb_get_txqueue_len(struct ifnet *ifp) { struct adapter *adapter = ifp->if_softc; - return adapter->num_queues; + return (adapter->num_queues); } static int igb_get_rxqueue_affinity(struct ifnet *ifp, int queid) { - return queid; + return (queid); } static int igb_get_txqueue_affinity(struct ifnet *ifp, int queid) { - return queid; + return (queid); } ==== //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#7 (text+ko) ==== @@ -1467,7 +1467,7 @@ static int softrss_get_txqueue_len(struct ifnet *ifp) { - return 1; + return (1); } static int @@ -1479,7 +1479,7 @@ static int softrss_get_txqueue_affinity(struct ifnet *ifp, int queid) { - return 0; + return (0); } #endif From owner-p4-projects@FreeBSD.ORG Tue Jul 19 12:15:21 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C17A1065672; Tue, 19 Jul 2011 12:15:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2FE5106566B for ; Tue, 19 Jul 2011 12:15:20 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B1B8E8FC15 for ; Tue, 19 Jul 2011 12:15: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 p6JCFKuE080550 for ; Tue, 19 Jul 2011 12:15:20 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JCFKSD080547 for perforce@freebsd.org; Tue, 19 Jul 2011 12:15:20 GMT (envelope-from syuu@FreeBSD.org) Date: Tue, 19 Jul 2011 12:15:20 GMT Message-Id: <201107191215.p6JCFKSD080547@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196397 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 Jul 2011 12:15:21 -0000 http://p4web.freebsd.org/@@196397?ac=10 Change 196397 by syuu@kikurage on 2011/07/19 12:14:18 NULL check before free() Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#14 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#14 (text+ko) ==== @@ -1568,8 +1568,11 @@ break; } d->bd_qmask.qm_enabled = FALSE; - free(d->bd_qmask.qm_rxq_mask, M_BPF); - free(d->bd_qmask.qm_txq_mask, M_BPF); + + if (d->bd_qmask.qm_rxq_mask != NULL) + free(d->bd_qmask.qm_rxq_mask, M_BPF); + if (d->bd_qmask.qm_txq_mask != NULL) + free(d->bd_qmask.qm_txq_mask, M_BPF); break; } From owner-p4-projects@FreeBSD.ORG Tue Jul 19 12:49:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62C971065676; Tue, 19 Jul 2011 12:49: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 258101065674 for ; Tue, 19 Jul 2011 12:49:18 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 12F748FC15 for ; Tue, 19 Jul 2011 12:49: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 p6JCnHP5086475 for ; Tue, 19 Jul 2011 12:49:17 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JCnH7O086472 for perforce@freebsd.org; Tue, 19 Jul 2011 12:49:17 GMT (envelope-from syuu@FreeBSD.org) Date: Tue, 19 Jul 2011 12:49:17 GMT Message-Id: <201107191249.p6JCnH7O086472@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196400 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 Jul 2011 12:49:18 -0000 http://p4web.freebsd.org/@@196400?ac=10 Change 196400 by syuu@kikurage on 2011/07/19 12:48:48 unified variable name from rxq/txq to rxqueue/txqueue. Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#12 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#15 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#8 edit .. //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#5 edit .. //depot/projects/soc2011/mq_bpf/src/sys/sys/mbuf.h#4 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#12 (text+ko) ==== @@ -853,8 +853,8 @@ break; } - m_head->m_pkthdr.rxqid = (uint32_t)-1; - m_head->m_pkthdr.txqid = txr->me; + m_head->m_pkthdr.rxqueue = (uint32_t)-1; + m_head->m_pkthdr.txqueue = txr->me; /* Send a copy of the frame to the BPF listener */ ETHER_BPF_MTAP(ifp, m_head); @@ -951,8 +951,8 @@ enq++; drbr_stats_update(ifp, next->m_pkthdr.len, next->m_flags); - next->m_pkthdr.rxqid = (uint32_t)-1; - next->m_pkthdr.txqid = txr->me; + next->m_pkthdr.rxqueue = (uint32_t)-1; + next->m_pkthdr.txqueue = txr->me; ETHER_BPF_MTAP(ifp, next); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) @@ -4524,8 +4524,8 @@ M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_NONE); } #endif - rxr->fmp->m_pkthdr.rxqid = que->msix; - rxr->fmp->m_pkthdr.txqid = (uint32_t)-1; + rxr->fmp->m_pkthdr.rxqueue = que->msix; + rxr->fmp->m_pkthdr.txqueue = (uint32_t)-1; sendmp = rxr->fmp; /* Make sure to set M_PKTHDR. */ ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#15 (text+ko) ==== @@ -2144,22 +2144,22 @@ continue; } else { log(LOG_DEBUG, "%s: ifp->if_get_rxqueue_len:%p\n", __func__, ifp->if_get_rxqueue_len); - if (m->m_pkthdr.rxqid != (uint32_t)-1 && m->m_pkthdr.rxqid >= ifp->if_get_rxqueue_len(ifp)) { - log(LOG_DEBUG, "rxqid is not vaild rxqid:%x rxq_num:%x\n", m->m_pkthdr.rxqid, ifp->if_get_rxqueue_len(ifp)); + if (m->m_pkthdr.rxqueue != (uint32_t)-1 && m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) { + log(LOG_DEBUG, "rxqueue is not vaild rxqueue:%x rxq_num:%x\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp)); BPFIF_RUNLOCK(bp, &tracker); return; } log(LOG_DEBUG, "%s: ifp->if_get_txqueue_len:%p\n", __func__, ifp->if_get_txqueue_len); - if (m->m_pkthdr.txqid != (uint32_t)-1 && m->m_pkthdr.txqid >= ifp->if_get_txqueue_len(ifp)) { - log(LOG_DEBUG, "txqid is not vaild txqid:%x txq_num:%x\n", m->m_pkthdr.txqid, ifp->if_get_txqueue_len(ifp)); + if (m->m_pkthdr.txqueue != (uint32_t)-1 && m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) { + log(LOG_DEBUG, "txqueue is not vaild txqueue:%x txq_num:%x\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp)); BPFIF_RUNLOCK(bp, &tracker); return; } - if (m->m_pkthdr.rxqid != (uint32_t)-1 && - !d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqid]) + if (m->m_pkthdr.rxqueue != (uint32_t)-1 && + !d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) continue; - if (m->m_pkthdr.txqid != (uint32_t)-1 && - !d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqid]) + if (m->m_pkthdr.txqueue != (uint32_t)-1 && + !d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) continue; } } @@ -2225,11 +2225,11 @@ BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { if (d->bd_qmask.qm_enabled) { - if (m->m_pkthdr.rxqid != (uint32_t)-1 && - !d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqid]) + if (m->m_pkthdr.rxqueue != (uint32_t)-1 && + !d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) continue; - if (m->m_pkthdr.txqid != (uint32_t)-1 && - !d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqid]) + if (m->m_pkthdr.txqueue != (uint32_t)-1 && + !d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) continue; } if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp)) ==== //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#8 (text+ko) ==== @@ -454,9 +454,9 @@ #ifdef SOFTRSS if (ifp->if_capenable & IFCAP_SOFT_MULTIQUEUE) { - log(LOG_DEBUG, "%s SOFTRSS setting txqid:0\n", __func__); - m->m_pkthdr.rxqid = (uint32_t)-1; - m->m_pkthdr.txqid = 0; + log(LOG_DEBUG, "%s SOFTRSS setting txqueue:0\n", __func__); + m->m_pkthdr.rxqueue = (uint32_t)-1; + m->m_pkthdr.txqueue = 0; } #endif ==== //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#5 (text+ko) ==== @@ -431,16 +431,16 @@ case M_HASHTYPE_RSS_TCP_IPV4: *cpuid = rss_getcpu(rss_getbucket(m->m_pkthdr.flowid)); #ifdef SOFTRSS - m->m_pkthdr.rxqid = *cpuid; - m->m_pkthdr.txqid = (uint32_t)-1; + m->m_pkthdr.rxqueue = *cpuid; + m->m_pkthdr.txqueue = (uint32_t)-1; #endif return (m); default: *cpuid = NETISR_CPUID_NONE; #ifdef SOFTRSS - m->m_pkthdr.rxqid = curcpu; - m->m_pkthdr.txqid = (uint32_t)-1; + m->m_pkthdr.rxqueue = curcpu; + m->m_pkthdr.txqueue = (uint32_t)-1; #endif return (m); } ==== //depot/projects/soc2011/mq_bpf/src/sys/sys/mbuf.h#4 (text+ko) ==== @@ -118,8 +118,8 @@ uint32_t flowid; /* packet's 4-tuple system * flow identifier */ - uint32_t rxqid; - uint32_t txqid; + uint32_t rxqueue; + uint32_t txqueue; /* variables for hardware checksum */ int csum_flags; /* flags regarding checksum */ int csum_data; /* data field used by csum routines */ From owner-p4-projects@FreeBSD.ORG Tue Jul 19 13:55:08 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66C881065676; Tue, 19 Jul 2011 13:55:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29818106566C for ; Tue, 19 Jul 2011 13:55:08 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E833F8FC0C for ; Tue, 19 Jul 2011 13:55:07 +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 p6JDt7Ew099825 for ; Tue, 19 Jul 2011 13:55:07 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JDt7fg099822 for perforce@freebsd.org; Tue, 19 Jul 2011 13:55:07 GMT (envelope-from syuu@FreeBSD.org) Date: Tue, 19 Jul 2011 13:55:07 GMT Message-Id: <201107191355.p6JDt7fg099822@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196403 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 Jul 2011 13:55:08 -0000 http://p4web.freebsd.org/@@196403?ac=10 Change 196403 by syuu@kikurage on 2011/07/19 13:55:06 skip genarating flowid on multiqueue if. Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.h#7 edit .. //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#6 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.h#7 (text+ko) ==== @@ -41,7 +41,6 @@ #define _NET_BPF_H_ #include -#include /* BSD style release date */ #define BPF_RELEASE 199606 @@ -1113,7 +1112,7 @@ u_int bif_dlt; /* link layer type */ u_int bif_hdrlen; /* length of link header */ struct ifnet *bif_ifp; /* corresponding interface */ - struct rmlock bif_lock; /* rmlock for interface */ + struct mtx bif_lock; /* rmlock for interface */ }; void bpf_bufheld(struct bpf_d *d); ==== //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#6 (text+ko) ==== @@ -60,6 +60,8 @@ #include #endif +#include + /*- * Operating system parts of receiver-side scaling (RSS), which allows * network cards to direct flows to particular receive queues based on hashes @@ -420,10 +422,17 @@ struct mbuf * rss_m2cpuid(struct mbuf *m, uintptr_t source, u_int *cpuid) { +#ifdef SOFTRSS + int softrss_pkt = 0; +#endif + M_ASSERTPKTHDR(m); #ifdef SOFTRSS - softrss_set_flowid(m); + if (!(m->m_flags & M_FLOWID)) { + softrss_pkt = 1; + softrss_set_flowid(m); + } #endif switch (M_HASHTYPE_GET(m)) { @@ -431,16 +440,20 @@ case M_HASHTYPE_RSS_TCP_IPV4: *cpuid = rss_getcpu(rss_getbucket(m->m_pkthdr.flowid)); #ifdef SOFTRSS - m->m_pkthdr.rxqueue = *cpuid; - m->m_pkthdr.txqueue = (uint32_t)-1; + if (softrss_pkt) { + m->m_pkthdr.rxqueue = *cpuid; + m->m_pkthdr.txqueue = (uint32_t)-1; + } #endif return (m); default: *cpuid = NETISR_CPUID_NONE; #ifdef SOFTRSS - m->m_pkthdr.rxqueue = curcpu; - m->m_pkthdr.txqueue = (uint32_t)-1; + if (softrss_pkt) { + m->m_pkthdr.rxqueue = curcpu; + m->m_pkthdr.txqueue = (uint32_t)-1; + } #endif return (m); } From owner-p4-projects@FreeBSD.ORG Tue Jul 19 21:32:36 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB8B11065672; Tue, 19 Jul 2011 21:32:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E1AB106566B for ; Tue, 19 Jul 2011 21:32:36 +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 6AB7E8FC14 for ; Tue, 19 Jul 2011 21:32:36 +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 p6JLWa37091979 for ; Tue, 19 Jul 2011 21:32:36 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JLWaxs091976 for perforce@freebsd.org; Tue, 19 Jul 2011 21:32:36 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 19 Jul 2011 21:32:36 GMT Message-Id: <201107192132.p6JLWaxs091976@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 196415 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 Jul 2011 21:32:37 -0000 http://p4web.freebsd.org/@@196415?ac=10 Change 196415 by rene@rene_acer on 2011/07/19 21:31:43 Finish raw translation of network-servers update, still needs spell and sanity/consistency check. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#44 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#44 (text+ko) ==== @@ -4403,7 +4403,132 @@ ouderzone. De ZSK wordt gebruikt om de zone te ondertekenen, en hoeft alleen daar gepubliceerd te worden. - + + Om DNSSEC aan te zetten voor de zone voorbeeld.com zoals beschreven in de + voorgaande voorbeelden, dient als eerste + dnssec-keygen gebruikt te worden om het + sleutelpaar met de KSK en ZSK + te genereren. Dit sleutelpaar kan verschillende cryptografische + algoritmes gebruiken. Het wordt aanbevolen om RSA/SHA-256 voor de + sleutels te gebruiken, een sleutellengte van 2048 bits zou voldoende + moeten zijn. Om de KSK voor voorbeeld.com te genereren: + + &prompt.user; dnssec-keygen -f KSK -a RSASHA256 -b 2048 -n ZONE voorbeeld.com + + en om de ZSK te genereren: + + &prompt.user; dnssec-keygen -a RSASHA256 -b 2048 -n ZONE voorbeeld.com + + dnssec-keygen maakt twee bestanden, de + publieke en private sleutels in bestanden met namen als + Kvoorbeeld.com.+005+nnnnn.key (publiek) en + Kvoorbeeld.com.+005+nnnnn.private (privaat). Het + gedeelte nnnnn van de bestandsnaam is een + sleutel-ID van vijf cijfers. Houd bij welke sleutel-ID bij welke + sleutel hoort. Dit is in het bijzonder van belang wanneer er meerdere + sleutels per zone zijn. Het is ook mogelijk om de sleutels te + hernoemen. Voor elk KSK-bestand: + + &prompt.user; mv Kvoorbeeld.com+005+nnnnn.key Kvoorbeeld.com+005+nnnn.KSK.key +&prompt.user; mv Kvoorbeeld.com+005+nnnnn.private Kvoorbeeld.com+005+nnnnn.KSK.private + + Voor ZSK-bestanden dient KSK + waar nodig door ZSK vervangen te worden. De + bestanden kunnen nu worden opgenomen in het zonebestand, door de + opdracht $include te gebruiken. Het zou er + ongeveer als volgt uit moeten zien: + + + $include Kvoorbeeld.com.+005+nnnnn.KSK.key ; KSK +$include Kvoorbeeld.com.+005+nnnnn.ZSK.key ; ZSK + + Tenslotte, onderteken de zone en vertel BIND om + het ondertekende zonebestand te gebruiken. Voor het ondertekenen van + een zone wordt dnssec-signzone gebruikt. + Het commando om de zone voorbeeld.com, dat zich in + voorbeeld.com.db bevindt, zou er ongeveer zo + uitzien: + + &prompt.user; dnssec-signzone -o voorbeeld.com -k Kvoorbeeld.com+005+nnnnn.KSK voorbeeld.com.db Kvoorbeeld.com+005+nnnnn.ZSK.key + + De sleutel die aan het argument wordt + meegegeven is de KSK en het andere sleutelbestand + is de ZSK dat bij het ondertekenen gebruikt moet + worden. Het is mogelijk om meer dan één + KSK en ZSK op te geven, wat tot + gevolg heeft dat de zone met alle meegegeven sleutels wordt + ondertekend. Dit kan nodig zijn om zonegegevens aan te leveren die + met meerdere algoritmes zijn ondertekend. De uitvoer van + dnssec-signzone is een zonebestand met + daarin alle RRs ondertekend. Deze uitvoer komt in + een bestand met de extensie .signed terecht, zoals + voorbeeld.com.db.signed. De DS-records worden ook naar een + apart bestand dsset-voorbeeld.com geschreven. Om + deze ondertekende zone te gebruiken hoeft alleen de zone-directief in + named.conf veranderd te worden om + voorbeeld.com.db.signed. Standaard zijn de + ondertekeningen slechts 30 dagen geldig, wat betekent dat de zone over + ongeveer 15 dagen hertekend moet worden om er zeker van te zijn dat + resolvers geen records met oude ondertekeningen cachen. Het is + mogelijk om hiervoor een script en een crontaak te maken. Bekijk de + relevante handleidingen voor details. + + Zorg ervoor dat de private sleutels veilig blijven, zoals met alle + cryptografische sleutels. Bij het veranderen van een sleutel is het + het beste om de nieuwe sleutel in de zone op te nemen, en nog met de + oude sleutel te ondertekenen, en om daarna over te stappen op de + nieuwe sleutel. Nadat deze handelingen zijn voltooid kan de oude + sleutel uit de zone worden verwijderd. Wanneer dit niet wordt gedaan + kunnen de DNS-gegevens tijdelijk onbeschikbaar zijn totdat de nieuwe sleutel door de DNS-hierarchie is + gepropageerd. Meer informatie over sleutelwisselingen en andere + praktijken rondom DNSSEC staan in RFC + 4641: DNSSEC Operational practices. + + + + Automatisering met <acronym>BIND</acronym> 9.7 of nieuwer + + In versie 9.7 van BIND is een nieuwe + mogelijkheid genaamd Smart Signing + geïntroduceerd. Deze mogelijkheid heeft als doel om het + sleutelbeheer en ondertekenproces eenvoudiger te maken door delen van + deze taken te automatiseren. Door de sleutels in een + sleutelreservoir te stoppen en de nieuwe optie + auto-dnssec te gebruiken, is het mogelijk om een + dynamische zone aan te maken welke opnieuw getekend wordt indien dat + nodig is. Gebruik om deze zone bij te werken + nsupdate met de nieuwe . + rndc kan nu ook zones ondertekenen met + sleutels uit het sleutelreservoir door de optie + te gebruiken. Voeg, om BIND dit automatische + ondertekenen en bijwerken van zones te laten gebruiken voor voorbeeld.com, het volgende aan + named.conf toe: + + zone voorbeeld.com { + type master; + key-directory "/etc/named/keys"; + update-policy local; + auto-dnssec maintain; + file "/etc/named/dynamic/voorbeeld.com.zone"; +}; + + Nadat deze veranderingen gemaakt zijn, dienen de sleutels voor de + zone aangemaakt te worden zoals uitgelegd in , deze sleutels in het sleutelreservoir + gestopt te worden dat als argument aan de + key-directory in het zoneconfiguratie is + meegegeven, waarna de zone automatisch zal worden ondertekend. Zones + die op deze manier zijn geconfigureerd dienen met + nsupdate te worden gedaan, dat voor het + opnieuw ondertekenen van de zone met de nieuw toegevoegde gegevens zal + zorgen. Zie voor meer details en de + BIND-documentatie. From owner-p4-projects@FreeBSD.ORG Wed Jul 20 12:31:03 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A6BF1065673; Wed, 20 Jul 2011 12:31: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 C111B106566C for ; Wed, 20 Jul 2011 12:31:02 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id AD4328FC12 for ; Wed, 20 Jul 2011 12:31:02 +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 p6KCV2PF071502 for ; Wed, 20 Jul 2011 12:31:02 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6KCV2NU071497 for perforce@freebsd.org; Wed, 20 Jul 2011 12:31:02 GMT (envelope-from ilya@FreeBSD.org) Date: Wed, 20 Jul 2011 12:31:02 GMT Message-Id: <201107201231.p6KCV2NU071497@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196439 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 Jul 2011 12:31:03 -0000 http://p4web.freebsd.org/@@196439?ac=10 Change 196439 by ilya@ilya_triton2011 on 2011/07/20 12:30:00 Count ticket references, use uma zone to allocate tickets Ticket can have up to 3 references: * Owned by fuse_dispatcher. Released by fdisp_destroy() which is called the same function fdisp_init() was * When added to answer or message list (can be on both). Reference is not automatically released when ticket removed from list. Function that removed ticket from list should release reference after processing. Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#15 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#18 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#19 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#19 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#14 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#9 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#19 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#22 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#42 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#15 (text+ko) ==== @@ -166,3 +166,6 @@ FUSE_OP_BACKGROUNDED = 0, FUSE_OP_FOREGROUNDED = 1, } fuse_op_waitfor_t; + +void fuse_ipc_init(void); +void fuse_ipc_destroy(void); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#13 (text+ko) ==== @@ -133,6 +133,10 @@ tick->tk_aw_errno = ENOTCONN; wakeup(tick); fuse_lck_mtx_unlock(tick->tk_aw_mtx); + fuse_lck_mtx_unlock(data->aw_mtx); + FUSE_ASSERT_AW_DONE(tick); + fuse_ticket_drop(tick); + fuse_lck_mtx_lock(data->aw_mtx); } fuse_lck_mtx_unlock(data->aw_mtx); @@ -201,7 +205,7 @@ return (ENODEV); } - if ( ! (tick = fuse_ms_pop(data))) { + if (!(tick = fuse_ms_pop(data))) { /* check if we may block */ if (ioflag & O_NONBLOCK) { /* get outa here soon */ @@ -217,7 +221,7 @@ tick = fuse_ms_pop(data); } } - if (! tick) { + if (!tick) { /* * We can get here if fuse daemon suddenly terminates, * eg, by being hit by a SIGKILL @@ -237,7 +241,8 @@ DEBUG2G("reader is to be sacked\n"); if (tick) { DEBUG2G("weird -- \"kick\" is set tho there is message\n"); - fuse_ticket_drop_invalid(tick); + FUSE_ASSERT_MS_DONE(tick); + fuse_ticket_drop(tick); } return (ENODEV); /* This should make the daemon get off of us */ } @@ -284,12 +289,8 @@ break; } - /* - * fuse_device_read will drop "not owned" tickets - * (used when the one who inserted the message thinks the daemon - * won't aswer) - */ - fuse_ticket_drop_invalid(tick); + FUSE_ASSERT_MS_DONE(tick); + fuse_ticket_drop(tick); return (err); } @@ -332,7 +333,7 @@ struct fuse_ticket *tick, *x_tick; int found = 0; - DEBUG("Fuse write -- resid: %zd, iovcnt: %d, thread: %d\n", + DEBUG("resid: %zd, iovcnt: %d, thread: %d\n", uio->uio_resid, uio->uio_iovcnt, uio->uio_td->td_tid); data = fuse_get_devdata(dev); @@ -383,15 +384,15 @@ * (Then, by all chance, she'll just get that's done * via ticket_drop(), so no manual mucking around...) */ + DEBUG("pass ticket to a callback\n"); memcpy(&tick->tk_aw_ohead, &ohead, sizeof(ohead)); err = tick->tk_aw_handler(tick, uio); - DEBUG("stuff been passed over to a callback\n"); } else { /* pretender doesn't wanna do anything with answer */ DEBUG("stuff devalidated, so we drop it\n"); - fuse_ticket_drop(tick); - return (err); } + FUSE_ASSERT_AW_DONE(tick); + fuse_ticket_drop(tick); } else { /* no callback at all! */ DEBUG("erhm, no handler for this response\n"); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#13 (text+ko) ==== @@ -86,7 +86,7 @@ if (err == ENOENT) { fuse_internal_vnode_disappear(vp); } - return err; + goto out; } foo = fdi.answ; @@ -94,9 +94,9 @@ fuse_filehandle_init(vp, fufh_type, fufhp, foo->fh); fuse_vnode_open(vp, foo->open_flags, td); - fuse_ticket_drop(fdi.tick); - - return 0; +out: + fdisp_destroy(&fdi); + return err; } int @@ -141,15 +141,12 @@ fri->flags = fuse_filehandle_xlate_to_oflags(fufh_type); if (waitfor == FUSE_OP_FOREGROUNDED) { - if ((err = fdisp_wait_answ(&fdi))) { - goto out; - } else { - fuse_ticket_drop(fdi.tick); - } + err = fdisp_wait_answ(&fdi); } else { fuse_insert_callback(fdi.tick, NULL); fuse_insert_message(fdi.tick); } + fdisp_destroy(&fdi); out: atomic_subtract_acq_int(&fuse_fh_count, 1); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#18 (text+ko) ==== @@ -144,9 +144,8 @@ fai->mask = F_OK; fai->mask |= mask; - if (!(err = fdisp_wait_answ(&fdi))) { - fuse_ticket_drop(fdi.tick); - } + err = fdisp_wait_answ(&fdi); + fdisp_destroy(&fdi); if (err == ENOSYS) { fuse_get_mpdata(mp)->dataflags |= FSESS_NOACCESS; @@ -168,8 +167,6 @@ FSESS_NOFSYNC : FSESS_NOFSYNCDIR; } - fuse_ticket_drop(tick); - return 0; } @@ -177,29 +174,29 @@ fuse_internal_fsync(struct vnode *vp, struct thread *td, struct ucred *cred, - struct fuse_filehandle *fufh, - void *param) + struct fuse_filehandle *fufh) { int op = FUSE_FSYNC; struct fuse_fsync_in *ffsi; - struct fuse_dispatcher *fdip = param; + struct fuse_dispatcher fdi; fuse_trace_printf_func(); - fdip->iosize = sizeof(*ffsi); - fdip->tick = NULL; if (vnode_isdir(vp)) { op = FUSE_FSYNCDIR; } - fdisp_make_vp(fdip, op, vp, td, cred); - ffsi = fdip->indata; + fdisp_init(&fdi, sizeof(*ffsi)); + fdisp_make_vp(&fdi, op, vp, td, cred); + ffsi = fdi.indata; ffsi->fh = fufh->fh_id; ffsi->fsync_flags = 1; /* datasync */ - fuse_insert_callback(fdip->tick, fuse_internal_fsync_callback); - fuse_insert_message(fdip->tick); + fuse_insert_callback(fdi.tick, fuse_internal_fsync_callback); + fuse_insert_message(fdi.tick); + + fdisp_destroy(&fdi); return 0; @@ -236,7 +233,7 @@ fri->size = min(uio_resid(uio), FUSE_DEFAULT_IOSIZE); // mp->max_read if ((err = fdisp_wait_answ(&fdi))) { - goto out; + break; } if ((err = fuse_internal_readdir_processdata(uio, fri->size, fdi.answ, @@ -245,9 +242,7 @@ } } - fuse_ticket_drop(fdi.tick); - -out: + fdisp_destroy(&fdi); return ((err == -1) ? 0 : err); } @@ -385,9 +380,8 @@ } #endif - if (!(err = fdisp_wait_answ(&fdi))) { - fuse_ticket_drop(fdi.tick); - } + err = fdisp_wait_answ(&fdi); + fdisp_destroy(&fdi); fuse_invalidate_attr(dvp); fuse_invalidate_attr(vp); @@ -437,9 +431,8 @@ ((char *)fdi.indata)[sizeof(*fri) + fcnp->cn_namelen + tcnp->cn_namelen + 1] = '\0'; - if (!(err = fdisp_wait_answ(&fdi))) { - fuse_ticket_drop(fdi.tick); - } + err = fdisp_wait_answ(&fdi); + fdisp_destroy(&fdi); fuse_invalidate_attr(fdvp); if (tdvp != fdvp) { @@ -490,20 +483,18 @@ feo = fdip->answ; if ((err = fuse_internal_checkentry(feo, vtyp))) { - goto out; + return err; } err = fuse_vnode_get(mp, feo->nodeid, dvp, vpp, cnp, vtyp, 0); if (err) { - fuse_internal_forget_send(mp, cnp->cn_thread, cnp->cn_cred, feo->nodeid, 1, fdip); + fuse_internal_forget_send(mp, cnp->cn_thread, cnp->cn_cred, + feo->nodeid, 1); return err; } cache_attrs(*vpp, feo); -out: - fuse_ticket_drop(fdip->tick); - return err; } @@ -524,6 +515,7 @@ fuse_internal_newentry_makerequest(mp, VTOI(dvp), cnp, op, buf, bufsize, &fdi); err = fuse_internal_newentry_core(dvp, vpp, cnp, vtype, &fdi); + fdisp_destroy(&fdi); fuse_invalidate_attr(dvp); return err; @@ -534,12 +526,8 @@ int fuse_internal_forget_callback(struct fuse_ticket *ftick, struct uio *uio) { - struct fuse_dispatcher fdi; - - fdi.tick = ftick; - fuse_internal_forget_send(ftick->tk_data->mp, curthread, NULL, - ((struct fuse_in_header *)ftick->tk_ms_fiov.base)->nodeid, 1, &fdi); + ((struct fuse_in_header *)ftick->tk_ms_fiov.base)->nodeid, 1); return 0; } @@ -549,27 +537,29 @@ struct thread *td, struct ucred *cred, uint64_t nodeid, - uint64_t nlookup, - struct fuse_dispatcher *fdip) + uint64_t nlookup) { + + struct fuse_dispatcher fdi; struct fuse_forget_in *ffi; - debug_printf("mp=%p, nodeid=%jd, nlookup=%jd, fdip=%p\n", - mp, (uintmax_t)nodeid, (uintmax_t)nlookup, fdip); + debug_printf("mp=%p, nodeid=%jd, nlookup=%jd\n", + mp, (uintmax_t)nodeid, (uintmax_t)nlookup); /* * KASSERT(nlookup > 0, ("zero-times forget for vp #%llu", * (long long unsigned) nodeid)); */ - fdisp_init(fdip, sizeof(*ffi)); - fdisp_make(fdip, FUSE_FORGET, mp, nodeid, td, cred); + fdisp_init(&fdi, sizeof(*ffi)); + fdisp_make(&fdi, FUSE_FORGET, mp, nodeid, td, cred); - ffi = fdip->indata; + ffi = fdi.indata; ffi->nlookup = nlookup; - fticket_invalidate(fdip->tick); - fuse_insert_message(fdip->tick); + fticket_invalidate(fdi.tick); + fuse_insert_message(fdi.tick); + fdisp_destroy(&fdi); } void @@ -623,8 +613,6 @@ } out: - fuse_ticket_drop(tick); - if (err) { fdata_set_dead(data); } @@ -653,6 +641,7 @@ fuse_insert_callback(fdi.tick, fuse_internal_init_callback); fuse_insert_message(fdi.tick); + fdisp_destroy(&fdi); } #ifdef ZERO_PAD_INCOMPLETE_BUFS ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#19 (text+ko) ==== @@ -220,8 +220,7 @@ fuse_internal_fsync(struct vnode *vp, struct thread *td, struct ucred *cred, - struct fuse_filehandle *fufh, - void *param); + struct fuse_filehandle *fufh); int fuse_internal_fsync_callback(struct fuse_ticket *tick, struct uio *uio); @@ -332,8 +331,7 @@ struct thread *td, struct ucred *cred, uint64_t nodeid, - uint64_t nlookup, - struct fuse_dispatcher *fdip); + uint64_t nlookup); /* fuse start/stop */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#19 (text+ko) ==== @@ -253,7 +253,7 @@ break; } - fuse_ticket_drop(fdi.tick); + fdisp_destroy(&fdi); out: return (err); @@ -270,7 +270,7 @@ int diff; int err = 0; - if (! uio->uio_resid) + if (!uio->uio_resid) return (0); fdisp_init(&fdi, 0); @@ -292,7 +292,7 @@ break; if ((err = fdisp_wait_answ(&fdi))) - return(err); + break; diff = chunksize - ((struct fuse_write_out *)fdi.answ)->size; if (diff < 0) { @@ -306,7 +306,7 @@ fuse_vnode_setsize(vp, cred, uio->uio_offset); } - fuse_ticket_drop(fdi.tick); + fdisp_destroy(&fdi); return (err); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#13 (text+ko) ==== @@ -22,6 +22,7 @@ #include #include #include +#include #include "fuse.h" #include "fuse_node.h" @@ -37,15 +38,7 @@ static int fticket_wait_answer(struct fuse_ticket *ftick); static __inline__ int fticket_aw_pull_uio(struct fuse_ticket *ftick, struct uio *uio); -static __inline__ void fuse_push_freeticks(struct fuse_ticket *ftick); - -static __inline__ struct fuse_ticket * -fuse_pop_freeticks(struct fuse_data *data); -static __inline__ void fuse_push_allticks(struct fuse_ticket *ftick); -static __inline__ void fuse_remove_allticks(struct fuse_ticket *ftick); -static struct fuse_ticket *fuse_pop_allticks(struct fuse_data *data); - static int fuse_body_audit(struct fuse_ticket *ftick, size_t blen); static __inline__ void fuse_setup_ihead(struct fuse_in_header *ihead, struct fuse_ticket *ftick, @@ -60,9 +53,9 @@ SYSCTL_NODE(_vfs, OID_AUTO, fuse, CTLFLAG_RW, 0, "FUSE tunables"); SYSCTL_STRING(_vfs_fuse, OID_AUTO, fuse4bsd_version, CTLFLAG_RD, FUSE4BSD_VERSION, 0, "fuse4bsd version"); -static int fuse_max_freetickets = 1024; -SYSCTL_INT(_vfs_fuse, OID_AUTO, max_freetickets, CTLFLAG_RW, - &fuse_max_freetickets, 0, "limit for number of free tickets kept"); +static int fuse_ticket_count = 0; +SYSCTL_INT(_vfs_fuse, OID_AUTO, ticket_count, CTLFLAG_RW, + &fuse_ticket_count, 0, "number of allocated tickets"); static long fuse_iov_permanent_bufsize = 1 << 19; SYSCTL_LONG(_vfs_fuse, OID_AUTO, iov_permanent_bufsize, CTLFLAG_RW, &fuse_iov_permanent_bufsize, 0, @@ -71,12 +64,9 @@ SYSCTL_INT(_vfs_fuse, OID_AUTO, iov_credit, CTLFLAG_RW, &fuse_iov_credit, 0, "how many times is an oversized fuse_iov tolerated"); -static unsigned maxtickets = 0; -SYSCTL_UINT(_vfs_fuse, OID_AUTO, maxtickets, CTLFLAG_RW, - &maxtickets, 0, "limit how many tickets are tolerated"); -MALLOC_DEFINE(M_FUSEMSG, "fuse_messaging", - "buffer for fuse messaging related things"); +MALLOC_DEFINE(M_FUSEMSG, "fuse_msgbuf", "fuse message buffer"); +static uma_zone_t ticket_zone; void fiov_init(struct fuse_iov *fiov, size_t size) @@ -98,6 +88,7 @@ { debug_printf("fiov=%p\n", fiov); + MPASS(fiov->base != NULL); free(fiov->base, M_FUSEMSG); } @@ -133,20 +124,55 @@ fiov_adjust(fiov, 0); } -static struct fuse_ticket * -fticket_alloc(struct fuse_data *data) +static int +fticket_ctor(void *mem, int size, void *arg, int flags) { - struct fuse_ticket *ftick; + struct fuse_ticket *ftick = mem; + struct fuse_data *data = arg; - ftick = malloc(sizeof(*ftick), M_FUSEMSG, M_WAITOK | M_ZERO); + debug_printf("ftick=%p data=%p\n", ftick, data); - debug_printf("ftick=%p data=%p\n", ftick, data); + FUSE_ASSERT_MS_DONE(ftick); + FUSE_ASSERT_AW_DONE(ftick); - mtx_lock(&data->ticket_mtx); - ftick->tk_unique = data->ticketer++; - mtx_unlock(&data->ticket_mtx); ftick->tk_data = data; + if (ftick->tk_unique != 0) + fticket_refresh(ftick); + + /* May be truncated to 32 bits */ + ftick->tk_unique = atomic_fetchadd_long(&data->ticketer, 1); + if (ftick->tk_unique == 0) + ftick->tk_unique = atomic_fetchadd_long(&data->ticketer, 1); + + refcount_init(&ftick->tk_refcount, 1); + atomic_add_acq_int(&fuse_ticket_count, 1); + + return 0; +} + +static void +fticket_dtor(void *mem, int size, void *arg) +{ + struct fuse_ticket *ftick = mem; + + debug_printf("ftick=%p\n", ftick); + + FUSE_ASSERT_MS_DONE(ftick); + FUSE_ASSERT_AW_DONE(ftick); + + atomic_subtract_acq_int(&fuse_ticket_count, 1); +} + +static int +fticket_init(void *mem, int size, int flags) +{ + struct fuse_ticket *ftick = mem; + + DEBUG("ftick=%p\n", ftick); + + bzero(ftick, sizeof(struct fuse_ticket)); + fiov_init(&ftick->tk_ms_fiov, sizeof(struct fuse_in_header)); ftick->tk_ms_type = FT_M_FIOV; @@ -154,7 +180,31 @@ fiov_init(&ftick->tk_aw_fiov, 0); ftick->tk_aw_type = FT_A_FIOV; - return ftick; + return 0; +} + +static void +fticket_fini(void *mem, int size) +{ + struct fuse_ticket *ftick = mem; + + DEBUG("ftick=%p\n", ftick); + + fiov_teardown(&ftick->tk_ms_fiov); + fiov_teardown(&ftick->tk_aw_fiov); + mtx_destroy(&ftick->tk_aw_mtx); +} + +static __inline struct fuse_ticket * +fticket_alloc(struct fuse_data *data) +{ + return uma_zalloc_arg(ticket_zone, data, M_WAITOK); +} + +static __inline void +fticket_destroy(struct fuse_ticket *ftick) +{ + return uma_zfree(ticket_zone, ftick); } static __inline__ @@ -163,6 +213,9 @@ { debug_printf("ftick=%p\n", ftick); + FUSE_ASSERT_MS_DONE(ftick); + FUSE_ASSERT_AW_DONE(ftick); + fiov_refresh(&ftick->tk_ms_fiov); ftick->tk_ms_bufdata = NULL; ftick->tk_ms_bufsize = 0; @@ -177,26 +230,6 @@ ftick->tk_aw_type = FT_A_FIOV; ftick->tk_flag = 0; - ftick->tk_age++; -} - -static void -fticket_destroy(struct fuse_ticket *ftick) -{ - debug_printf("ftick=%p\n", ftick); - - KASSERT(ftick->tk_ms_link.stqe_next == NULL, - ("FUSE: destroying ticket still on message list %p", ftick)); - KASSERT(ftick->tk_aw_link.tqe_next == NULL && - ftick->tk_aw_link.tqe_prev == NULL, - ("FUSE: destroying ticket still on answer delivery list %p", ftick)); - - fiov_teardown(&ftick->tk_ms_fiov); - - mtx_destroy(&ftick->tk_aw_mtx); - fiov_teardown(&ftick->tk_aw_fiov); - - free(ftick, M_FUSEMSG); } static int @@ -315,12 +348,9 @@ STAILQ_INIT(&data->ms_head); mtx_init(&data->ticket_mtx, "fuse ticketer mutex", NULL, MTX_DEF); debug_printf("ALLOC_INIT data=%p ticket_mtx=%p\n", data, &data->ticket_mtx); - STAILQ_INIT(&data->freetickets_head); - TAILQ_INIT(&data->alltickets_head); mtx_init(&data->aw_mtx, "fuse answer list mutex", NULL, MTX_DEF); TAILQ_INIT(&data->aw_head); data->ticketer = 0; - data->freeticket_counter = 0; data->daemoncred = crhold(cred); data->daemon_timeout = FUSE_DEFAULT_DAEMON_TIMEOUT; @@ -334,8 +364,6 @@ void fdata_destroy(struct fuse_data *data) { - struct fuse_ticket *ftick; - debug_printf("data=%p, destroy.mntco = %d\n", data, data->mntco); /* Driving off stage all that stuff thrown at device... */ @@ -346,10 +374,6 @@ sx_destroy(&data->rename_lock); #endif - while ((ftick = fuse_pop_allticks(data))) { - fticket_destroy(ftick); - } - crfree(data->daemoncred); free(data,M_FUSEMSG); @@ -376,71 +400,6 @@ fuse_lck_mtx_unlock(data->ticket_mtx); } -static __inline__ -void -fuse_push_freeticks(struct fuse_ticket *ftick) -{ - debug_printf("ftick=%p\n", ftick); - - STAILQ_INSERT_TAIL(&ftick->tk_data->freetickets_head, ftick, - tk_freetickets_link); - ftick->tk_data->freeticket_counter++; -} - -static __inline__ -struct fuse_ticket * -fuse_pop_freeticks(struct fuse_data *data) -{ - struct fuse_ticket *ftick; - - debug_printf("data=%p\n", data); - - if ((ftick = STAILQ_FIRST(&data->freetickets_head))) { - STAILQ_REMOVE_HEAD(&data->freetickets_head, tk_freetickets_link); - data->freeticket_counter--; - } - - if (STAILQ_EMPTY(&data->freetickets_head) && - (data->freeticket_counter != 0)) { - panic("FUSE: ticket count mismatch!"); - } - - return ftick; -} - -static __inline__ -void -fuse_push_allticks(struct fuse_ticket *ftick) -{ - debug_printf("ftick=%p\n", ftick); - - TAILQ_INSERT_TAIL(&ftick->tk_data->alltickets_head, ftick, - tk_alltickets_link); -} - -static __inline__ -void -fuse_remove_allticks(struct fuse_ticket *ftick) -{ - debug_printf("ftick=%p\n", ftick); - - TAILQ_REMOVE(&ftick->tk_data->alltickets_head, ftick, tk_alltickets_link); -} - -static struct fuse_ticket * -fuse_pop_allticks(struct fuse_data *data) -{ - struct fuse_ticket *ftick; - - debug_printf("data=%p\n", data); - - if ((ftick = TAILQ_FIRST(&data->alltickets_head))) { - fuse_remove_allticks(ftick); - } - - return ftick; -} - struct fuse_ticket * fuse_ticket_fetch(struct fuse_data *data) { @@ -449,31 +408,17 @@ debug_printf("data=%p\n", data); - fuse_lck_mtx_lock(data->ticket_mtx); + ftick = fticket_alloc(data); - if (data->freeticket_counter == 0) { - fuse_lck_mtx_unlock(data->ticket_mtx); - ftick = fticket_alloc(data); - if (!ftick) { - panic("ticket allocation failed"); - } + if (!(data->dataflags & FSESS_INITED) && data->ticketer > 2) { + /* Sleep until get answer for INIT messsage */ fuse_lck_mtx_lock(data->ticket_mtx); - fuse_push_allticks(ftick); - } else { - /* locked here */ - ftick = fuse_pop_freeticks(data); - if (!ftick) { - panic("no free ticket despite the counter's value"); + if (!(data->dataflags & FSESS_INITED) && data->ticketer > 2) { + err = msleep(&data->ticketer, &data->ticket_mtx, PCATCH | PDROP, + "fu_ini", 0); } } - if (!(data->dataflags & FSESS_INITED) && data->ticketer > 1) { - err = msleep(&data->ticketer, &data->ticket_mtx, PCATCH | PDROP, - "fu_ini", 0); - } else { - fuse_lck_mtx_unlock(data->ticket_mtx); - } - if (err) { fdata_set_dead(data); } @@ -481,50 +426,23 @@ return ftick; } -void +int fuse_ticket_drop(struct fuse_ticket *ftick) { - int die = 0; + int die; - debug_printf("ftick=%p\n", ftick); - - fuse_lck_mtx_lock(ftick->tk_data->ticket_mtx); - - if (fuse_max_freetickets >= 0 && - fuse_max_freetickets <= ftick->tk_data->freeticket_counter) { - die = 1; - } else { - fuse_lck_mtx_unlock(ftick->tk_data->ticket_mtx); - fticket_refresh(ftick); - fuse_lck_mtx_lock(ftick->tk_data->ticket_mtx); - } - - /* locked here */ - - if (die) { - fuse_remove_allticks(ftick); - fuse_lck_mtx_unlock(ftick->tk_data->ticket_mtx); + die = refcount_release(&ftick->tk_refcount); + debug_printf("ftick=%p refcount=%d\n", ftick, ftick->tk_refcount); + if (die) fticket_destroy(ftick); - } else { - fuse_push_freeticks(ftick); - fuse_lck_mtx_unlock(ftick->tk_data->ticket_mtx); - } -} -void -fuse_ticket_drop_invalid(struct fuse_ticket *ftick) -{ - debug_printf("ftick=%p\n", ftick); - - if (ftick->tk_flag & FT_INVAL) { - fuse_ticket_drop(ftick); - } + return die; } void fuse_insert_callback(struct fuse_ticket *ftick, fuse_handler_t *handler) { - debug_printf("ftick=%p, handler=%p\n", ftick, handler); + debug_printf("ftick=%p, handler=%p data=%p\n", ftick, ftick->tk_data, handler); if (fdata_get_dead(ftick->tk_data)) { return; @@ -760,7 +678,6 @@ fuse_standard_handler(struct fuse_ticket *ftick, struct uio *uio) { int err = 0; - int dropflag = 0; debug_printf("ftick=%p, uio=%p\n", ftick, uio); @@ -768,13 +685,7 @@ fuse_lck_mtx_lock(ftick->tk_aw_mtx); - if (fticket_answered(ftick)) { - /* The requester was interrupted and she set the "answered" flag - * to notify us. In this case, we don't have to care about - * anything, just drop the ticket and get out as fast as we can. - */ - dropflag = 1; - } else { + if (!fticket_answered(ftick)) { fticket_set_answered(ftick); ftick->tk_aw_errno = err; wakeup(ftick); @@ -782,10 +693,6 @@ fuse_lck_mtx_unlock(ftick->tk_aw_mtx); - if (dropflag) { - fuse_ticket_drop(ftick); - } - return err; } @@ -808,10 +715,6 @@ fdip->tick = fuse_ticket_fetch(data); } - if (fdip->tick == 0) { - panic("fuse_ticket_fetch() failed"); - } - FUSE_DIMALLOC(&fdip->tick->tk_ms_fiov, fdip->finh, fdip->indata, fdip->iosize); @@ -915,7 +818,20 @@ out: debug_printf("IPC: dropping ticket, err = %d\n", err); - fuse_ticket_drop(fdip->tick); return err; } + +void +fuse_ipc_init(void) +{ + ticket_zone = uma_zcreate("fuse_ticket", sizeof(struct fuse_ticket), + fticket_ctor, fticket_dtor, fticket_init, fticket_fini, + UMA_ALIGN_PTR, 0); +} + +void +fuse_ipc_destroy(void) +{ + uma_zdestroy(ticket_zone); +} ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#14 (text+ko) ==== @@ -6,6 +6,9 @@ #ifndef _FUSE_IPC_H_ #define _FUSE_IPC_H_ +#include +#include + struct fuse_iov { void *base; size_t len; @@ -27,6 +30,15 @@ #define FU_AT_LEAST(siz) max((siz), 160) +#define FUSE_ASSERT_AW_DONE(ftick) \ + KASSERT((ftick)->tk_aw_link.tqe_next == NULL && \ + (ftick)->tk_aw_link.tqe_prev == NULL, \ + ("FUSE: ticket still on answer delivery list %p", (ftick))) \ + +#define FUSE_ASSERT_MS_DONE(ftick) \ + KASSERT((ftick)->tk_ms_link.stqe_next == NULL, \ + ("FUSE: ticket still on message list %p", (ftick))) + struct fuse_ticket; struct fuse_data; @@ -37,22 +49,19 @@ uint64_t tk_unique; struct fuse_data *tk_data; int tk_flag; - uint32_t tk_age; + u_int tk_refcount; - STAILQ_ENTRY(fuse_ticket) tk_freetickets_link; - TAILQ_ENTRY(fuse_ticket) tk_alltickets_link; - /* fields for initiating an upgoing message */ struct fuse_iov tk_ms_fiov; void *tk_ms_bufdata; - unsigned long tk_ms_bufsize; + size_t tk_ms_bufsize; enum { FT_M_FIOV, FT_M_BUF } tk_ms_type; STAILQ_ENTRY(fuse_ticket) tk_ms_link; /* fields for handling answers coming from userspace */ struct fuse_iov tk_aw_fiov; void *tk_aw_bufdata; - unsigned long tk_aw_bufsize; + size_t tk_aw_bufsize; enum { FT_A_FIOV, FT_A_BUF } tk_aw_type; struct fuse_out_header tk_aw_ohead; @@ -70,7 +79,6 @@ struct fuse_iov * fticket_resp(struct fuse_ticket *ftick) { - DEBUGX(FUSE_DEBUG_IPC, "-> ftick=%p\n", ftick); return (&ftick->tk_aw_fiov); } @@ -131,10 +139,7 @@ TAILQ_HEAD(, fuse_ticket) aw_head; struct mtx ticket_mtx; - STAILQ_HEAD(, fuse_ticket) freetickets_head; - TAILQ_HEAD(, fuse_ticket) alltickets_head; - uint32_t freeticket_counter; - uint64_t ticketer; + u_long ticketer; #ifdef FUSE_EXPLICIT_RENAME_LOCK struct sx rename_lock; @@ -183,7 +188,6 @@ fuse_get_mpdata(struct mount *mp) { struct fuse_data *data = mp->mnt_data; - DEBUGX(FUSE_DEBUG_IPC, "-> mp=%p\n", mp); return (data->mpri == FM_PRIMARY ? data : NULL); } @@ -191,8 +195,10 @@ void fuse_ms_push(struct fuse_ticket *ftick) { - DEBUGX(FUSE_DEBUG_IPC, "-> ftick=%p\n", ftick); + DEBUGX(FUSE_DEBUG_IPC, "ftick=%p refcount=%d\n", + ftick, ftick->tk_refcount + 1); mtx_assert(&ftick->tk_data->ms_mtx, MA_OWNED); + refcount_acquire(&ftick->tk_refcount); STAILQ_INSERT_TAIL(&ftick->tk_data->ms_head, ftick, tk_ms_link); } @@ -202,7 +208,6 @@ { struct fuse_ticket *ftick = NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 20 20:37:22 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C4AE106567B; Wed, 20 Jul 2011 20:37:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2887106566C for ; Wed, 20 Jul 2011 20:37:21 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BF4E28FC1C for ; Wed, 20 Jul 2011 20:37:21 +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 p6KKbL5n068976 for ; Wed, 20 Jul 2011 20:37:21 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6KKbLNG068973 for perforce@freebsd.org; Wed, 20 Jul 2011 20:37:21 GMT (envelope-from syuu@FreeBSD.org) Date: Wed, 20 Jul 2011 20:37:21 GMT Message-Id: <201107202037.p6KKbLNG068973@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196458 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 Jul 2011 20:37:22 -0000 http://p4web.freebsd.org/@@196458?ac=10 Change 196458 by syuu@kikurage on 2011/07/20 20:37:16 lock bpf_d during reading/writing qmask, reduce number of threads on test_mqbpf Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#16 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpfdesc.h#6 edit .. //depot/projects/soc2011/mq_bpf/tests/test_mqbpf.c#4 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#16 (text+ko) ==== @@ -1,3 +1,4 @@ + /*- * Copyright (c) 1990, 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -1519,16 +1520,19 @@ { struct ifnet *ifp; + BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ + BPFD_UNLOCK(d); error = EINVAL; break; } if (d->bd_qmask.qm_enabled) { log(LOG_ERR, "d->bd_qmask.qm_enabled\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1536,6 +1540,7 @@ if (!(ifp->if_capabilities & (IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))) { log(LOG_ERR, "if doesn't support multiqueue\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1549,21 +1554,25 @@ malloc(ifp->if_get_txqueue_len(ifp) * sizeof(boolean_t), M_BPF, M_WAITOK | M_ZERO); d->bd_qmask.qm_other_mask = FALSE; + BPFD_UNLOCK(d); break; } case BIOCDISQMASK: { + BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ + BPFD_UNLOCK(d); error = EINVAL; break; } if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1573,6 +1582,7 @@ free(d->bd_qmask.qm_rxq_mask, M_BPF); if (d->bd_qmask.qm_txq_mask != NULL) free(d->bd_qmask.qm_txq_mask, M_BPF); + BPFD_UNLOCK(d); break; } @@ -1581,16 +1591,19 @@ struct ifnet *ifp; int index; + BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ + BPFD_UNLOCK(d); error = EINVAL; break; } if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1598,10 +1611,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { log(LOG_ERR, "BIOCSTRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); + BPFD_UNLOCK(d); error = EINVAL; break; } d->bd_qmask.qm_rxq_mask[index] = TRUE; + BPFD_UNLOCK(d); break; } @@ -1610,16 +1625,19 @@ int index; struct ifnet *ifp; + BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ + BPFD_UNLOCK(d); error = EINVAL; break; } if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1627,10 +1645,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { log(LOG_ERR, "BIOCCRRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); + BPFD_UNLOCK(d); error = EINVAL; break; } d->bd_qmask.qm_rxq_mask[index] = FALSE; + BPFD_UNLOCK(d); break; } @@ -1639,16 +1659,19 @@ int index; struct ifnet *ifp; + BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ + BPFD_UNLOCK(d); error = EINVAL; break; } if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1656,10 +1679,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { log(LOG_ERR, "BIOCGTRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); + BPFD_UNLOCK(d); error = EINVAL; break; } *(uint32_t *)addr = d->bd_qmask.qm_rxq_mask[index]; + BPFD_UNLOCK(d); break; } @@ -1668,16 +1693,19 @@ struct ifnet *ifp; int index; + BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ + BPFD_UNLOCK(d); error = EINVAL; break; } if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1686,10 +1714,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { log(LOG_ERR, "BIOCSTTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); + BPFD_UNLOCK(d); error = EINVAL; break; } d->bd_qmask.qm_txq_mask[index] = TRUE; + BPFD_UNLOCK(d); break; } @@ -1698,16 +1728,19 @@ struct ifnet *ifp; int index; + BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ + BPFD_UNLOCK(d); error = EINVAL; break; } if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1716,10 +1749,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { log(LOG_ERR, "BIOCCRTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); + BPFD_UNLOCK(d); error = EINVAL; break; } d->bd_qmask.qm_txq_mask[index] = FALSE; + BPFD_UNLOCK(d); break; } @@ -1728,16 +1763,19 @@ int index; struct ifnet *ifp; + BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ + BPFD_UNLOCK(d); error = EINVAL; break; } if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); + BPFD_UNLOCK(d); error = EINVAL; break; } @@ -1745,23 +1783,31 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { log(LOG_ERR, "BIOCGTTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); + BPFD_UNLOCK(d); error = EINVAL; break; } *(uint32_t *)addr = d->bd_qmask.qm_txq_mask[index]; + BPFD_UNLOCK(d); break; } case BIOCSTOTHERMASK: + BPFD_LOCK(d); d->bd_qmask.qm_other_mask = TRUE; + BPFD_UNLOCK(d); break; case BIOCCROTHERMASK: + BPFD_LOCK(d); d->bd_qmask.qm_other_mask = FALSE; + BPFD_UNLOCK(d); break; case BIOCGTOTHERMASK: + BPFD_LOCK(d); *(uint32_t *)addr = (uint32_t)d->bd_qmask.qm_other_mask; + BPFD_UNLOCK(d); break; } CURVNET_RESTORE(); @@ -2075,12 +2121,14 @@ gottime = BPF_TSTAMP_NONE; BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { + BPFD_LOCK(d); if (d->bd_qmask.qm_enabled) { - if (!d->bd_qmask.qm_other_mask) + if (!d->bd_qmask.qm_other_mask) { + BPFD_UNLOCK(d); continue; + } } - BPFD_LOCK(d); ++d->bd_rcount; /* * NB: We dont call BPF_CHECK_DIRECTION() here since there is no @@ -2136,36 +2184,45 @@ gottime = BPF_TSTAMP_NONE; BPFIF_RLOCK(bp, &tracker); - struct ifnet *ifp = bp->bif_ifp; LIST_FOREACH(d, &bp->bif_dlist, bd_next) { + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp)) + continue; + BPFD_LOCK(d); if (d->bd_qmask.qm_enabled) { + M_ASSERTPKTHDR(m); if (!(m->m_flags & M_FLOWID)) { - if (!d->bd_qmask.qm_other_mask) + if (!d->bd_qmask.qm_other_mask) { + BPFD_UNLOCK(d); continue; + } } else { - log(LOG_DEBUG, "%s: ifp->if_get_rxqueue_len:%p\n", __func__, ifp->if_get_rxqueue_len); - if (m->m_pkthdr.rxqueue != (uint32_t)-1 && m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) { - log(LOG_DEBUG, "rxqueue is not vaild rxqueue:%x rxq_num:%x\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp)); - BPFIF_RUNLOCK(bp, &tracker); - return; + struct ifnet *ifp = bp->bif_ifp; + if (m->m_pkthdr.rxqueue != (uint32_t)-1) { + if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) { + log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp)); + BPFD_UNLOCK(d); + BPFIF_RUNLOCK(bp, &tracker); + return; + } + if (!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) { + BPFD_UNLOCK(d); + continue; + } } - log(LOG_DEBUG, "%s: ifp->if_get_txqueue_len:%p\n", __func__, ifp->if_get_txqueue_len); - if (m->m_pkthdr.txqueue != (uint32_t)-1 && m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) { - log(LOG_DEBUG, "txqueue is not vaild txqueue:%x txq_num:%x\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp)); - BPFIF_RUNLOCK(bp, &tracker); - return; + if (m->m_pkthdr.txqueue != (uint32_t)-1) { + if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) { + log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp)); + BPFD_UNLOCK(d); + BPFIF_RUNLOCK(bp, &tracker); + return; + } + if (!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) { + BPFD_UNLOCK(d); + continue; + } } - if (m->m_pkthdr.rxqueue != (uint32_t)-1 && - !d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) - continue; - if (m->m_pkthdr.txqueue != (uint32_t)-1 && - !d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) - continue; } } - if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp)) - continue; - BPFD_LOCK(d); ++d->bd_rcount; #ifdef BPF_JITTER bf = bpf_jitter_enable != 0 ? d->bd_bfilter : NULL; @@ -2224,17 +2281,44 @@ gottime = BPF_TSTAMP_NONE; BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - if (d->bd_qmask.qm_enabled) { - if (m->m_pkthdr.rxqueue != (uint32_t)-1 && - !d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) - continue; - if (m->m_pkthdr.txqueue != (uint32_t)-1 && - !d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) - continue; - } if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp)) continue; BPFD_LOCK(d); + if (d->bd_qmask.qm_enabled) { + M_ASSERTPKTHDR(m); + if (!(m->m_flags & M_FLOWID)) { + if (!d->bd_qmask.qm_other_mask) { + BPFD_UNLOCK(d); + continue; + } + } else { + struct ifnet *ifp = bp->bif_ifp; + if (m->m_pkthdr.rxqueue != (uint32_t)-1) { + if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) { + log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp)); + BPFD_UNLOCK(d); + BPFIF_RUNLOCK(bp, &tracker); + return; + } + if (!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) { + BPFD_UNLOCK(d); + continue; + } + } + if (m->m_pkthdr.txqueue != (uint32_t)-1) { + if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) { + log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp)); + BPFD_UNLOCK(d); + BPFIF_RUNLOCK(bp, &tracker); + return; + } + if (!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) { + BPFD_UNLOCK(d); + continue; + } + } + } + } ++d->bd_rcount; slen = bpf_filter(d->bd_rfilter, (u_char *)&mb, pktlen, 0); if (slen != 0) { ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpfdesc.h#6 (text+ko) ==== @@ -153,7 +153,7 @@ }; #define BPFIF_LOCK_INIT(bif, d) \ - mtx_init(&(bif)->bif_lock, (d), "bpf if lock", MTX_DEF); + mtx_init(&(bif)->bif_lock, "bpf interface lock", NULL, MTX_DEF); #define BPFIF_LOCK_DESTROY(bif) mtx_destroy(&(bif)->bif_lock) #define BPFIF_RLOCK(bif, tracker) mtx_lock(&(bif)->bif_lock) #define BPFIF_RUNLOCK(bif, tracker) mtx_unlock(&(bif)->bif_lock) ==== //depot/projects/soc2011/mq_bpf/tests/test_mqbpf.c#4 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -66,7 +67,7 @@ #include #include -#define CAP_FORMAT "cap.dat.%d.%d" +#define CAP_FORMAT "cap.dat.%d" #define BPF_FORMAT "/dev/bpf%d" #define QUEUE_TYPE_RX 0 @@ -75,8 +76,9 @@ struct bpf_thread_instance { pthread_t thread; - int type; - int queue; + int rxqueue; + int txqueue; + int other; int cpu; cpuset_t cpuset; int fd; @@ -103,13 +105,12 @@ ifr.ifr_addr.sa_family = AF_LOCAL; strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (instance->type != QUEUE_TYPE_OTHER) { - CPU_ZERO(&instance->cpuset); - CPU_SET(instance->cpu, &instance->cpuset); - cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, - sizeof(cpuset_t), &instance->cpuset); - } - snprintf(filename, sizeof(filename), CAP_FORMAT, instance->type, instance->queue); + CPU_ZERO(&instance->cpuset); + CPU_SET(instance->cpu, &instance->cpuset); + cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, + sizeof(cpuset_t), &instance->cpuset); + + snprintf(filename, sizeof(filename), CAP_FORMAT, instance->cpu); instance->fd = open(filename, O_RDWR | O_CREAT); if (instance->fd < 0) { perror("open"); @@ -156,30 +157,30 @@ perror("malloc"); return -1; } + if (ioctl(bpf, BIOCENAQMASK, NULL) < 0) { perror("enable qmask"); return -1; } - switch (instance->type) { - case QUEUE_TYPE_RX: - if (ioctl(bpf, BIOCSTRXQMASK, &instance->queue) < 0) { + if (instance->rxqueue > -1) { + if (ioctl(bpf, BIOCSTRXQMASK, &instance->rxqueue) < 0) { perror("rx qmask"); return -1; } - break; - case QUEUE_TYPE_TX: - if (ioctl(bpf, BIOCSTTXQMASK, &instance->queue) < 0) { + } + + if (instance->txqueue > -1) { + if (ioctl(bpf, BIOCSTTXQMASK, &instance->txqueue) < 0) { perror("tx qmask"); return -1; } - break; - case QUEUE_TYPE_OTHER: - if (ioctl(bpf, BIOCSTOTHERMASK, &instance->queue) < 0) { + } + if (instance->other > -1) { + if (ioctl(bpf, BIOCSTOTHERMASK, &instance->other) < 0) { perror("other qmask"); return -1; } - break; } instance->wrote = 0; @@ -271,7 +272,8 @@ int main(int argc, char **argv) { struct ifreq ifr; - int i, j, s, ret; + int i, s, ret, maxcpus; + size_t size = sizeof(maxcpus); struct sigaction action = { .sa_handler = timer_handler, .sa_flags = 0 @@ -307,8 +309,11 @@ } rxqlen = ifr.ifr_rxqueue_len; txqlen = ifr.ifr_txqueue_len; + + sysctlbyname("hw.ncpu", &maxcpus, &size, NULL, 0); + instances = (struct bpf_thread_instance *) - malloc(sizeof(struct bpf_thread_instance) * (rxqlen + txqlen + 1)); + calloc(maxcpus, sizeof(struct bpf_thread_instance)); sigemptyset(&action.sa_mask); if (sigaction(SIGALRM, &action, NULL) < 0) { @@ -321,36 +326,40 @@ } gettimeofday(&start, NULL); + + for (i = 0; i < maxcpus; i++) { + instances[i].cpu = i; + instances[i].rxqueue = -1; + instances[i].txqueue = -1; + instances[i].other = 0; + } + for (i = 0; i < rxqlen; i++) { - instances[i].type = QUEUE_TYPE_RX; - instances[i].queue = ifr.ifr_queue_affinity_index = i; + ifr.ifr_queue_affinity_index = i; if (ioctl(s, SIOCGIFRXQAFFINITY, &ifr)) { perror("SIOCGIFRXQAFFINITY"); return -1; } - instances[i].cpu = ifr.ifr_queue_affinity_cpu; - pthread_create(&instances[i].thread, NULL, - (void *(*)(void *))bpf_thread, &instances[i]); + instances[ifr.ifr_queue_affinity_cpu].rxqueue = i; } - for (i = 0, j = rxqlen; i < txqlen; i++, j++) { - instances[j].type = QUEUE_TYPE_TX; - instances[j].queue = ifr.ifr_queue_affinity_index = i; + + for (i = 0; i < txqlen; i++) { + ifr.ifr_queue_affinity_index = i; if (ioctl(s, SIOCGIFTXQAFFINITY, &ifr)) { - perror("SIOCGIFRXQAFFINITY"); + perror("SIOCGIFTXQAFFINITY"); return -1; } - instances[j].cpu = ifr.ifr_queue_affinity_cpu; - pthread_create(&instances[j].thread, NULL, - (void *(*)(void *))bpf_thread, &instances[j]); + instances[ifr.ifr_queue_affinity_cpu].txqueue = i; } - instances[j].type = QUEUE_TYPE_OTHER; - instances[j].queue = 1; - pthread_create(&instances[j].thread, NULL, - (void *(*)(void *))bpf_thread, &instances[j]); + + instances[0].other = 1; + + for (i = 0; i < maxcpus; i++) + pthread_create(&instances[i].thread, NULL, + (void *(*)(void *))bpf_thread, &instances[i]); - for (i = 0; i < (rxqlen + txqlen + 1); i++) { + for (i = 0; i < maxcpus; i++) pthread_join(instances[i].thread, (void **)&ret); - } return 0; } From owner-p4-projects@FreeBSD.ORG Wed Jul 20 23:19:58 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C25311065686; Wed, 20 Jul 2011 23:19:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 844FF106568F for ; Wed, 20 Jul 2011 23:19:58 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 711E58FC19 for ; Wed, 20 Jul 2011 23:19:58 +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 p6KNJwoM002261 for ; Wed, 20 Jul 2011 23:19:58 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6KNJwmP002258 for perforce@freebsd.org; Wed, 20 Jul 2011 23:19:58 GMT (envelope-from syuu@FreeBSD.org) Date: Wed, 20 Jul 2011 23:19:58 GMT Message-Id: <201107202319.p6KNJwmP002258@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196464 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 Jul 2011 23:19:59 -0000 http://p4web.freebsd.org/@@196464?ac=10 Change 196464 by syuu@kikurage on 2011/07/20 23:19:09 Rewrite BPFIF_LOCK to rwlock, rwlock for bpf_qmask added, tests moved to src/tools/regression/bpf/mq_bpf. Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#17 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.h#8 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpfdesc.h#7 edit .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_ifqueue/Makefile#1 add .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_ifqueue/test_ifqueue.c#1 add .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_mqbpf/Makefile#1 add .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_mqbpf/test_mqbpf.c#1 add .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_sqbpf/Makefile#1 add .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_sqbpf/test_sqbpf.c#1 add .. //depot/projects/soc2011/mq_bpf/tests/Makefile#4 delete .. //depot/projects/soc2011/mq_bpf/tests/test_ifqueue.c#2 delete .. //depot/projects/soc2011/mq_bpf/tests/test_mqbpf.c#5 delete .. //depot/projects/soc2011/mq_bpf/tests/test_sqbpf.c#4 delete Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#17 (text+ko) ==== @@ -695,6 +695,7 @@ d->bd_qmask.qm_rxq_mask = NULL; d->bd_qmask.qm_txq_mask = NULL; d->bd_qmask.qm_other_mask = FALSE; + BPFQ_LOCK_INIT(&d->bd_qmask, "qmask lock"); #ifdef MAC mac_bpfdesc_init(d); mac_bpfdesc_create(td->td_ucred, d); @@ -1520,19 +1521,18 @@ { struct ifnet *ifp; - BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ - BPFD_UNLOCK(d); error = EINVAL; break; } + BPFQ_WLOCK(&d->bd_qmask); if (d->bd_qmask.qm_enabled) { log(LOG_ERR, "d->bd_qmask.qm_enabled\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1540,7 +1540,7 @@ if (!(ifp->if_capabilities & (IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))) { log(LOG_ERR, "if doesn't support multiqueue\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1554,25 +1554,24 @@ malloc(ifp->if_get_txqueue_len(ifp) * sizeof(boolean_t), M_BPF, M_WAITOK | M_ZERO); d->bd_qmask.qm_other_mask = FALSE; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } case BIOCDISQMASK: { - BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ - BPFD_UNLOCK(d); error = EINVAL; break; } + BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1582,7 +1581,7 @@ free(d->bd_qmask.qm_rxq_mask, M_BPF); if (d->bd_qmask.qm_txq_mask != NULL) free(d->bd_qmask.qm_txq_mask, M_BPF); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } @@ -1591,19 +1590,18 @@ struct ifnet *ifp; int index; - BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ - BPFD_UNLOCK(d); error = EINVAL; break; } + BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1611,12 +1609,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { log(LOG_ERR, "BIOCSTRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } d->bd_qmask.qm_rxq_mask[index] = TRUE; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } @@ -1625,19 +1623,18 @@ int index; struct ifnet *ifp; - BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ - BPFD_UNLOCK(d); error = EINVAL; break; } + BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1645,12 +1642,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { log(LOG_ERR, "BIOCCRRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } d->bd_qmask.qm_rxq_mask[index] = FALSE; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } @@ -1659,19 +1656,18 @@ int index; struct ifnet *ifp; - BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ - BPFD_UNLOCK(d); error = EINVAL; break; } + BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1679,12 +1675,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_rxqueue_len(ifp)) { log(LOG_ERR, "BIOCGTRXQMASK: index too large index:%x rxq_num:%x\n", index, ifp->if_get_rxqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } *(uint32_t *)addr = d->bd_qmask.qm_rxq_mask[index]; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } @@ -1693,19 +1689,18 @@ struct ifnet *ifp; int index; - BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ - BPFD_UNLOCK(d); error = EINVAL; break; } + BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1714,12 +1709,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { log(LOG_ERR, "BIOCSTTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } d->bd_qmask.qm_txq_mask[index] = TRUE; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } @@ -1728,19 +1723,18 @@ struct ifnet *ifp; int index; - BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ - BPFD_UNLOCK(d); error = EINVAL; break; } + BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1749,12 +1743,12 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { log(LOG_ERR, "BIOCCRTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } d->bd_qmask.qm_txq_mask[index] = FALSE; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } @@ -1763,19 +1757,18 @@ int index; struct ifnet *ifp; - BPFD_LOCK(d); if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* * No interface attached yet. */ - BPFD_UNLOCK(d); error = EINVAL; break; } + BPFQ_WLOCK(&d->bd_qmask); if (!d->bd_qmask.qm_enabled) { log(LOG_ERR, "!d->bd_qmask.qm_enabled\n"); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } @@ -1783,31 +1776,31 @@ index = *(uint32_t *)addr; if (index > ifp->if_get_txqueue_len(ifp)) { log(LOG_ERR, "BIOCGTTXQMASK: index too large index:%x txq_num:%x\n", index, ifp->if_get_txqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); error = EINVAL; break; } *(uint32_t *)addr = d->bd_qmask.qm_txq_mask[index]; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } case BIOCSTOTHERMASK: - BPFD_LOCK(d); + BPFQ_WLOCK(&d->bd_qmask); d->bd_qmask.qm_other_mask = TRUE; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; case BIOCCROTHERMASK: - BPFD_LOCK(d); + BPFQ_WLOCK(&d->bd_qmask); d->bd_qmask.qm_other_mask = FALSE; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; case BIOCGTOTHERMASK: - BPFD_LOCK(d); + BPFQ_WLOCK(&d->bd_qmask); *(uint32_t *)addr = (uint32_t)d->bd_qmask.qm_other_mask; - BPFD_UNLOCK(d); + BPFQ_WUNLOCK(&d->bd_qmask); break; } CURVNET_RESTORE(); @@ -2116,7 +2109,7 @@ #endif u_int slen; int gottime; -// struct rm_priotracker tracker; + struct rm_priotracker tracker; gottime = BPF_TSTAMP_NONE; BPFIF_RLOCK(bp, &tracker); @@ -2172,7 +2165,7 @@ #endif u_int pktlen, slen; int gottime; -// struct rm_priotracker tracker; + struct rm_priotracker tracker; /* Skip outgoing duplicate packets. */ if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) { @@ -2185,14 +2178,14 @@ gottime = BPF_TSTAMP_NONE; BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp)) - continue; - BPFD_LOCK(d); + struct rm_priotracker qm_tracker; + + BPFQ_RLOCK(&d->bd_qmask, &qm_tracker); if (d->bd_qmask.qm_enabled) { M_ASSERTPKTHDR(m); if (!(m->m_flags & M_FLOWID)) { if (!d->bd_qmask.qm_other_mask) { - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); continue; } } else { @@ -2200,29 +2193,34 @@ if (m->m_pkthdr.rxqueue != (uint32_t)-1) { if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) { log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); BPFIF_RUNLOCK(bp, &tracker); return; } if (!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) { - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); continue; } } if (m->m_pkthdr.txqueue != (uint32_t)-1) { if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) { log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); BPFIF_RUNLOCK(bp, &tracker); return; } if (!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) { - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); continue; } } } } + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); + + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp)) + continue; + BPFD_LOCK(d); ++d->bd_rcount; #ifdef BPF_JITTER bf = bpf_jitter_enable != 0 ? d->bd_bfilter : NULL; @@ -2259,7 +2257,7 @@ struct bpf_d *d; u_int pktlen, slen; int gottime; -// struct rm_priotracker tracker; + struct rm_priotracker tracker; /* Skip outgoing duplicate packets. */ if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) { @@ -2281,14 +2279,14 @@ gottime = BPF_TSTAMP_NONE; BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp)) - continue; - BPFD_LOCK(d); + struct rm_priotracker qm_tracker; + + BPFQ_RLOCK(&d->bd_qmask, &qm_tracker); if (d->bd_qmask.qm_enabled) { M_ASSERTPKTHDR(m); if (!(m->m_flags & M_FLOWID)) { if (!d->bd_qmask.qm_other_mask) { - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); continue; } } else { @@ -2296,29 +2294,34 @@ if (m->m_pkthdr.rxqueue != (uint32_t)-1) { if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) { log(LOG_DEBUG, "invalid rxqueue:%d len:%d\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); BPFIF_RUNLOCK(bp, &tracker); return; } if (!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue]) { - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); continue; } } if (m->m_pkthdr.txqueue != (uint32_t)-1) { if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) { log(LOG_DEBUG, "invalid txqueue:%d len:%d\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp)); - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); BPFIF_RUNLOCK(bp, &tracker); return; } if (!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue]) { - BPFD_UNLOCK(d); + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); continue; } } } } + BPFQ_RUNLOCK(&d->bd_qmask, &qm_tracker); + + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp)) + continue; + BPFD_LOCK(d); ++d->bd_rcount; slen = bpf_filter(d->bd_rfilter, (u_char *)&mb, pktlen, 0); if (slen != 0) { @@ -2758,7 +2761,7 @@ { struct bpf_if *bp; struct bpf_d *bd; -// struct rm_priotracker tracker; + struct rm_priotracker tracker; mtx_lock(&bpf_mtx); LIST_FOREACH(bp, &bpf_iflist, bif_next) { @@ -2816,7 +2819,7 @@ int index, error; struct bpf_if *bp; struct bpf_d *bd; -// struct rm_priotracker tracker; + struct rm_priotracker tracker; /* * XXX This is not technically correct. It is possible for non ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.h#8 (text+ko) ==== @@ -41,6 +41,7 @@ #define _NET_BPF_H_ #include +#include /* BSD style release date */ #define BPF_RELEASE 199606 @@ -1112,7 +1113,7 @@ u_int bif_dlt; /* link layer type */ u_int bif_hdrlen; /* length of link header */ struct ifnet *bif_ifp; /* corresponding interface */ - struct mtx bif_lock; /* rmlock for interface */ + struct rmlock bif_lock; /* rmlock for interface */ }; void bpf_bufheld(struct bpf_d *d); ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpfdesc.h#7 (text+ko) ==== @@ -44,14 +44,25 @@ #include #include #include +#include +#include struct bpf_qmask { boolean_t qm_enabled; boolean_t * qm_rxq_mask; boolean_t * qm_txq_mask; boolean_t qm_other_mask; + struct rmlock qm_lock; }; +#define BPFQ_LOCK_INIT(qm, d) \ + rm_init_flags(&(qm)->qm_lock, (d), RM_NOWITNESS | RM_RECURSE); +#define BPFQ_LOCK_DESTROY(qm) rm_destroy(&(qm)->qm_lock) +#define BPFQ_RLOCK(qm, tracker) rm_rlock(&(qm)->qm_lock, (tracker)) +#define BPFQ_RUNLOCK(qm, tracker) rm_runlock(&(qm)->qm_lock, (tracker)) +#define BPFQ_WLOCK(qm) rm_wlock(&(qm)->qm_lock) +#define BPFQ_WUNLOCK(qm) rm_wunlock(&(qm)->qm_lock) + /* * Descriptor associated with each open bpf file. */ @@ -153,11 +164,11 @@ }; #define BPFIF_LOCK_INIT(bif, d) \ - mtx_init(&(bif)->bif_lock, "bpf interface lock", NULL, MTX_DEF); -#define BPFIF_LOCK_DESTROY(bif) mtx_destroy(&(bif)->bif_lock) -#define BPFIF_RLOCK(bif, tracker) mtx_lock(&(bif)->bif_lock) -#define BPFIF_RUNLOCK(bif, tracker) mtx_unlock(&(bif)->bif_lock) -#define BPFIF_WLOCK(bif) mtx_lock(&(bif)->bif_lock) -#define BPFIF_WUNLOCK(bif) mtx_unlock(&(bif)->bif_lock) + rm_init_flags(&(bif)->bif_lock, (d), RM_NOWITNESS | RM_RECURSE); +#define BPFIF_LOCK_DESTROY(bif) rm_destroy(&(bif)->bif_lock) +#define BPFIF_RLOCK(bif, tracker) rm_rlock(&(bif)->bif_lock, (tracker)) +#define BPFIF_RUNLOCK(bif, tracker) rm_runlock(&(bif)->bif_lock, (tracker)) +#define BPFIF_WLOCK(bif) rm_wlock(&(bif)->bif_lock) +#define BPFIF_WUNLOCK(bif) rm_wunlock(&(bif)->bif_lock) #endif From owner-p4-projects@FreeBSD.ORG Wed Jul 20 23:35:21 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F4201065677; Wed, 20 Jul 2011 23:35:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41DA5106566C for ; Wed, 20 Jul 2011 23:35:21 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 302AB8FC12 for ; Wed, 20 Jul 2011 23:35:21 +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 p6KNZLHU005766 for ; Wed, 20 Jul 2011 23:35:21 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6KNZLHg005763 for perforce@freebsd.org; Wed, 20 Jul 2011 23:35:21 GMT (envelope-from syuu@FreeBSD.org) Date: Wed, 20 Jul 2011 23:35:21 GMT Message-Id: <201107202335.p6KNZLHg005763@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196466 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 Jul 2011 23:35:21 -0000 http://p4web.freebsd.org/@@196466?ac=10 Change 196466 by syuu@kikurage on 2011/07/20 23:34:47 NULL check is not needed for free(9), pointed out by Joshua Neal Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#18 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#18 (text+ko) ==== @@ -1577,10 +1577,8 @@ } d->bd_qmask.qm_enabled = FALSE; - if (d->bd_qmask.qm_rxq_mask != NULL) - free(d->bd_qmask.qm_rxq_mask, M_BPF); - if (d->bd_qmask.qm_txq_mask != NULL) - free(d->bd_qmask.qm_txq_mask, M_BPF); + free(d->bd_qmask.qm_rxq_mask, M_BPF); + free(d->bd_qmask.qm_txq_mask, M_BPF); BPFQ_WUNLOCK(&d->bd_qmask); break; } From owner-p4-projects@FreeBSD.ORG Thu Jul 21 01:04:10 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 127E61065672; Thu, 21 Jul 2011 01:04: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 B0E46106564A for ; Thu, 21 Jul 2011 01:04:09 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9DF3E8FC0C for ; Thu, 21 Jul 2011 01:04:09 +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 p6L149Yi023668 for ; Thu, 21 Jul 2011 01:04:09 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6L149i2023665 for perforce@freebsd.org; Thu, 21 Jul 2011 01:04:09 GMT (envelope-from jceel@freebsd.org) Date: Thu, 21 Jul 2011 01:04:09 GMT Message-Id: <201107210104.p6L149i2023665@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196472 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 Jul 2011 01:04:10 -0000 http://p4web.freebsd.org/@@196472?ac=10 Change 196472 by jceel@jceel_cyclone on 2011/07/21 01:03:33 Add initial version of GPIO driver. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#6 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#5 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_gpio.c#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#4 edit .. //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#6 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#6 (text+ko) ==== @@ -86,6 +86,12 @@ device mmcsd device lpcmmc +device gpio +device gpioled +device lpcgpio + +#device lpcfb + # Flattened Device Tree options FDT options FDT_DTB_STATIC ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#5 (text+ko) ==== @@ -12,5 +12,7 @@ arm/lpc/if_lpe.c optional lpe arm/lpc/lpc_ohci.c optional ohci arm/lpc/lpc_mmc.c optional lpcmmc +#arm/lpc/lpc_fb.c optional lpcfb +arm/lpc/lpc_gpio.c optional lpcgpio dev/uart/uart_dev_ns8250.c optional uart kern/kern_clocksource.c standard ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_gpio.c#2 (text+ko) ==== @@ -26,3 +26,272 @@ */ #include __FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include "gpio_if.h" + +struct lpc_gpio_softc +{ + device_t lg_dev; + struct resource * lg_res; + bus_space_tag_t lg_bst; + bus_space_handle_t lg_bsh; +}; + +#define LPC_GPIO_NPINS (32 * 2) + +static int lpc_gpio_probe(device_t); +static int lpc_gpio_attach(device_t); +static int lpc_gpio_detach(device_t); + +static int lpc_gpio_pin_max(device_t, int *); +static int lpc_gpio_pin_getcaps(device_t, uint32_t, uint32_t *); +static int lpc_gpio_pin_getflags(device_t, uint32_t, uint32_t *); +static int lpc_gpio_pin_setflags(device_t, uint32_t, uint32_t); +static int lpc_gpio_pin_getname(device_t, uint32_t, char *); +static int lpc_gpio_pin_get(device_t, uint32_t, uint32_t *); +static int lpc_gpio_pin_set(device_t, uint32_t, uint32_t); +static int lpc_gpio_pin_toggle(device_t, uint32_t); + +#define lpc_gpio_read_4(_sc, _reg) \ + bus_space_read_4(_sc->lg_bst, _sc->lg_bsh, _reg) +#define lpc_gpio_write_4(_sc, _reg, _val) \ + bus_space_write_4(_sc->lg_bst, _sc->lg_bsh, _reg, _val) + +static int +lpc_gpio_probe(device_t dev) +{ + if (!ofw_bus_is_compatible(dev, "lpc,gpio")) + return (ENXIO); + + return (BUS_PROBE_DEFAULT); +} + +static int +lpc_gpio_attach(device_t dev) +{ + struct lpc_gpio_softc *sc = device_get_softc(dev); + int rid; + + sc->lg_dev = dev; + + rid = 0; + sc->lg_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (!sc->lg_res) { + device_printf(dev, "cannot allocate memory window\n"); + return (ENXIO); + } + + sc->lg_bst = rman_get_bustag(sc->lg_res); + sc->lg_bsh = rman_get_bushandle(sc->lg_res); + + device_add_child(dev, "gpioc", device_get_unit(dev)); + device_add_child(dev, "gpiobus", device_get_unit(dev)); + + return (bus_generic_attach(dev)); +} + +static int +lpc_gpio_detach(device_t dev) +{ + /* XXX */ + return (0); +} + +static int +lpc_gpio_pin_max(device_t dev, int *npins) +{ + /* Currently supports only P0 and P1 */ + *npins = LPC_GPIO_NPINS; + return (0); +} + +static int +lpc_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps) +{ + if (pin > LPC_GPIO_NPINS) + return (ENODEV); + + *caps = GPIO_PIN_INPUT | GPIO_PIN_OUTPUT; + return (0); +} + +static int +lpc_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags) +{ + struct lpc_gpio_softc *sc = device_get_softc(dev); + uint32_t direction; + + if (pin >= 32) { + pin -= 32; + direction = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE); + } else { + direction = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE); + } + + if (direction & (1 << pin)) + *flags = GPIO_PIN_OUTPUT; + else + *flags = GPIO_PIN_INPUT; + + return (0); +} + +static int +lpc_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) +{ + struct lpc_gpio_softc *sc = device_get_softc(dev); + uint32_t direction, state; + + if (flags & GPIO_PIN_INPUT) + direction = 0; + + if (flags & GPIO_PIN_OUTPUT) + direction = 1; + + if (pin >= 32) { + pin -= 32; + state = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE); + lpc_gpio_write_4(sc, LPC_GPIO_P1_DIR_SET, state | (direction << pin)); + } else { + state = lpc_gpio_read_4(sc, LPC_GPIO_P1_DIR_STATE); + lpc_gpio_write_4(sc, LPC_GPIO_P1_DIR_SET, state | (direction << pin)); + + } + + return (0); +} + +static int +lpc_gpio_pin_getname(device_t dev, uint32_t pin, char *name) +{ + snprintf(name, GPIOMAXNAME - 1, "pin%d", pin); + return (0); +} + +static int +lpc_gpio_pin_get(device_t dev, uint32_t pin, uint32_t *value) +{ + struct lpc_gpio_softc *sc = device_get_softc(dev); + uint32_t state; + + if (pin >= 32) { + pin -= 32; + state = lpc_gpio_read_4(sc, LPC_GPIO_P1_INP_STATE); + *value = (state & (1 << pin)); + } else { + state = lpc_gpio_read_4(sc, LPC_GPIO_P0_INP_STATE); + *value = (state & (1 << pin)); + } + + return (0); +} + +static int +lpc_gpio_pin_set(device_t dev, uint32_t pin, uint32_t value) +{ + struct lpc_gpio_softc *sc = device_get_softc(dev); + uint32_t state; + + if (pin >= 32) { + pin -= 32; + state = lpc_gpio_read_4(sc, LPC_GPIO_P1_OUTP_STATE); + state = value ? state | (1 << pin) : state & ~(1 << pin); + lpc_gpio_write_4(sc, LPC_GPIO_P1_OUTP_SET, state); + } else { + state = lpc_gpio_read_4(sc, LPC_GPIO_P0_OUTP_STATE); + state = value ? state | (1 << pin) : state & ~(1 << pin); + lpc_gpio_write_4(sc, LPC_GPIO_P0_OUTP_SET, state | (1 << pin)); + } + + return (0); +} + +static int +lpc_gpio_pin_toggle(device_t dev, uint32_t pin) +{ + struct lpc_gpio_softc *sc = device_get_softc(dev); + uint32_t state; + + if (pin >= 32) { + pin -= 32; + state = lpc_gpio_read_4(sc, LPC_GPIO_P1_OUTP_STATE); + state = (state & (1 << pin)) ? state & ~(1 << pin) : state | (1 << pin); + lpc_gpio_write_4(sc, LPC_GPIO_P1_OUTP_SET, state); + } else { + state = lpc_gpio_read_4(sc, LPC_GPIO_P0_OUTP_STATE); + state = (state & (1 << pin)) ? state & ~(1 << pin) : state | (1 << pin); + lpc_gpio_write_4(sc, LPC_GPIO_P0_OUTP_SET, state | (1 << pin)); + } + + return (0); + +} + +static device_method_t lpc_gpio_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, lpc_gpio_probe), + DEVMETHOD(device_attach, lpc_gpio_attach), + DEVMETHOD(device_detach, lpc_gpio_detach), + + /* GPIO interface */ + DEVMETHOD(gpio_pin_max, lpc_gpio_pin_max), + DEVMETHOD(gpio_pin_getcaps, lpc_gpio_pin_getcaps), + DEVMETHOD(gpio_pin_getflags, lpc_gpio_pin_getflags), + DEVMETHOD(gpio_pin_setflags, lpc_gpio_pin_setflags), + DEVMETHOD(gpio_pin_getname, lpc_gpio_pin_getname), + DEVMETHOD(gpio_pin_set, lpc_gpio_pin_set), + DEVMETHOD(gpio_pin_get, lpc_gpio_pin_get), + DEVMETHOD(gpio_pin_toggle, lpc_gpio_pin_toggle), + + { 0, 0 } +}; + +static devclass_t lpc_gpio_devclass; + +static driver_t lpc_gpio_driver = { + "lpcgpio", + lpc_gpio_methods, + sizeof(struct lpc_gpio_softc), +}; + +extern devclass_t gpiobus_devclass, gpioc_devclass; +extern driver_t gpiobus_driver, gpioc_driver; + +DRIVER_MODULE(lpcgpio, simplebus, lpc_gpio_driver, lpc_gpio_devclass, 0, 0); +DRIVER_MODULE(gpiobus, lpcgpio, gpiobus_driver, gpiobus_devclass, 0, 0); +DRIVER_MODULE(gpioc, lpcgpio, gpioc_driver, gpioc_devclass, 0, 0); +MODULE_VERSION(lpcgpio, 1); ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#4 (text+ko) ==== @@ -341,5 +341,61 @@ #define LPC_ISP3101_OTG_INTR_RISING 0x0e #define LPC_ISP3101_REG_CLEAR_ADDR 0x01 +/* + * LCD Controller (from UM10326: LPC32x0 User manual, page 229) + */ +#define LPC_LCD_TIMH 0x00 +#define LPC_LCD_TIMV 0x04 +#define LPC_LCD_POL 0x08 +#define LPC_LCD_LE 0x0c +#define LPC_LCD_UPBASE 0x10 +#define LPC_LCD_LPBASE 0x14 +#define LPC_LCD_CTRL 0x18 +#define LPC_LCD_INTMSK 0x1c +#define LPC_LCD_INTRAW 0x20 +#define LPC_LCD_INTSTAT 0x24 +#define LPC_LCD_INTCLR 0x28 +#define LPC_LCD_UPCURR 0x2c +#define LPC_LCD_LPCURR 0x30 +#define LPC_LCD_PAL 0x200 +#define LPC_LCD_CRSR_IMG 0x800 +#define LPC_LCD_CRSR_CTRL 0xc00 +#define LPC_LCD_CRSR_CFG 0xc04 +#define LPC_LCD_CRSR_PAL0 0xc08 +#define LPC_LCD_CRSR_PAL1 0xc0c +#define LPC_LCD_CRSR_XY 0xc10 +#define LPC_LCD_CRSR_CLIP 0xc14 +#define LPC_LCD_CRSR_INTMSK 0xc20 +#define LPC_LCD_CRSR_INTCLR 0xc24 +#define LPC_LCD_CRSR_INTRAW 0xc28 +#define LPC_LCD_CRSR_INTSTAT 0xc2c + +/* + * GPIO (from UM10326: LPC32x0 User manual, page 606) + */ +#define LPC_GPIO_P0_INP_STATE 0x40 +#define LPC_GPIO_P0_OUTP_SET 0x44 +#define LPC_GPIO_P0_OUTP_CLR 0x48 +#define LPC_GPIO_P0_OUTP_STATE 0x4c +#define LPC_GPIO_P0_DIR_SET 0x50 +#define LPC_GPIO_P0_DIR_CLR 0x54 +#define LPC_GPIO_P0_DIR_STATE 0x58 +#define LPC_GPIO_P1_INP_STATE 0x60 +#define LPC_GPIO_P1_OUTP_SET 0x64 +#define LPC_GPIO_P1_OUTP_CLR 0x68 +#define LPC_GPIO_P1_OUTP_STATE 0x6c +#define LPC_GPIO_P1_DIR_SET 0x70 +#define LPC_GPIO_P1_DIR_CLR 0x74 +#define LPC_GPIO_P1_DIR_STATE 0x78 +#define LPC_GPIO_P2_INP_STATE 0x1c +#define LPC_GPIO_P2_OUTP_SET 0x20 +#define LPC_GPIO_P2_OUTP_CLR 0x24 +#define LPC_GPIO_P2_DIR_SET 0x10 +#define LPC_GPIO_P2_DIR_CLR 0x14 +#define LPC_GPIO_P2_DIR_STATE 0x14 +#define LPC_GPIO_P3_INP_STATE 0x00 +#define LPC_GPIO_P3_OUTP_SET 0x04 +#define LPC_GPIO_P3_OUTP_CLR 0x08 +#define LPC_GPIO_P3_OUTP_STATE 0x0c #endif /* _ARM_LPC_LPCREG_H */ ==== //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#6 (text+ko) ==== @@ -166,6 +166,11 @@ interrupts = <24>; interrupt-parent = <&PIC>; }; + + gpio@28000 { + compatible = "lpc,gpio"; + reg = <0x28000 0x4000>; + }; }; ahb6@30000000 { @@ -180,6 +185,13 @@ interrupts = <59>; interrupt-parent = <&PIC>; }; + + lpcfb@1040000 { + compatible = "lpc,fb"; + reg = <0x1040000 0x20000>; + interrupts = <14>; + interrupt-parent = <&PIC>; + }; lpe@1060000 { compatible = "lpc,ethernet"; @@ -209,7 +221,7 @@ lpcmmc@98000 { compatible = "lpc,mmc"; reg = <0x98000 0x4000>; - interrupts = <15>; + interrupts = <15 13>; interrupt-parent = <&PIC>; }; }; From owner-p4-projects@FreeBSD.ORG Thu Jul 21 11:39:33 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B6641065673; Thu, 21 Jul 2011 11:39:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E25A91065670 for ; Thu, 21 Jul 2011 11:39:32 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B72918FC0A for ; Thu, 21 Jul 2011 11:39:32 +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 p6LBdWAl056321 for ; Thu, 21 Jul 2011 11:39:32 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6LBdWel056318 for perforce@freebsd.org; Thu, 21 Jul 2011 11:39:32 GMT (envelope-from cnicutar@freebsd.org) Date: Thu, 21 Jul 2011 11:39:32 GMT Message-Id: <201107211139.p6LBdWel056318@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196496 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 Jul 2011 11:39:33 -0000 http://p4web.freebsd.org/@@196496?ac=10 Change 196496 by cnicutar@cnicutar_cronos on 2011/07/21 11:38:33 Add UTO support to telnet command mode. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/commands.c#3 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/externs.h#3 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/main.c#3 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/commands.c#3 (text+ko) ==== @@ -878,6 +878,7 @@ { "escape", "character to escape back to telnet command mode", NULL, &escape }, { "rlogin", "rlogin escape character", 0, &rlogin }, { "tracefile", "file to write trace information to", SetNetTrace, (cc_t *)NetTraceFile}, + { "timeout", "tcp timeout for this connection", set_timeout, NULL}, { " ", "", NULL, NULL }, { " ", "The following need 'localchars' to be toggled true", NULL, NULL }, { "flushoutput", "character to cause an Abort Output", NULL, termFlushCharp }, @@ -920,6 +921,21 @@ } } +void +set_timeout(char *s) +{ + if (s == NULL) { + uto = 0; + /* There is not way to "take it back". */ + return; + } + /* Setting the timeout if net is a valid descriptor. */ + uto = strtonum(s, 0, INT_MAX, NULL); + if (uto && net > 0 && setsockopt(net, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, + &uto, sizeof(uto))) + perror("setsockopt UTO"); +} + static int setcmd(int argc, char *argv[]) { @@ -977,7 +993,8 @@ return 0; } else if (ct->handler) { (*ct->handler)(argv[2]); - printf("%s set to \"%s\".\n", ct->name, (char *)ct->charp); + if (ct->charp) + printf("%s set to \"%s\".\n", ct->name, (char *)ct->charp); } else { if (strcmp("off", argv[2])) { value = special(argv[2]); @@ -1043,7 +1060,8 @@ return 0; } else if (ct->handler) { (*ct->handler)(0); - printf("%s reset to \"%s\".\n", ct->name, (char *)ct->charp); + if (ct->charp) + printf("%s reset to \"%s\".\n", ct->name, (char *)ct->charp); } else { *(ct->charp) = _POSIX_VDISABLE; printf("%s character is '%s'.\n", ct->name, control(*(ct->charp))); ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/externs.h#3 (text+ko) ==== @@ -261,6 +261,7 @@ setcommandmode(void), set_escape_char(char *s), setneturg(void), + set_timeout(char *s), sys_telnet_init(void), telnet(char *), tel_enter_binary(int), ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/contrib/telnet/telnet/main.c#3 (text+ko) ==== @@ -304,7 +304,10 @@ src_addr = optarg; break; case 't': - uto = strtonum(optarg, 0, INT_MAX, NULL); + set_timeout(optarg); + if (!uto) + fprintf(stderr, "Warning: timeout `%s'" + " ignored\n", optarg); break; case 'u': family = AF_UNIX; From owner-p4-projects@FreeBSD.ORG Thu Jul 21 14:18:36 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E5FD1065674; Thu, 21 Jul 2011 14:18:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30A031065672 for ; Thu, 21 Jul 2011 14:18:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1E77B8FC34 for ; Thu, 21 Jul 2011 14:18:36 +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 p6LEIZfZ088280 for ; Thu, 21 Jul 2011 14:18:35 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6LEIZWa088277 for perforce@freebsd.org; Thu, 21 Jul 2011 14:18:35 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 21 Jul 2011 14:18:35 GMT Message-Id: <201107211418.p6LEIZWa088277@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196502 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 Jul 2011 14:18:36 -0000 http://p4web.freebsd.org/@@196502?ac=10 Change 196502 by mjacob@mjacob-sandbox on 2011/07/21 14:17:50 Updates from Alacritech tree. Affected files ... .. //depot/projects/mjacob-dev/sys/dev/mpt2sas/mpt2cam.c#4 edit .. //depot/projects/mjacob-dev/sys/dev/mpt2sas/mpt2sas.c#6 edit .. //depot/projects/mjacob-dev/sys/dev/mpt2sas/mpt2sas.h#7 edit Differences ... ==== //depot/projects/mjacob-dev/sys/dev/mpt2sas/mpt2cam.c#4 (text+ko) ==== @@ -435,7 +435,8 @@ return; } - if ((req = mpt2sas_get_request(mpt)) == NULL) { + MPT2SAS_GET_REQUEST(mpt, req); + if (req == NULL) { if (mpt->outofbeer == 0) { mpt->outofbeer = 1; xpt_freeze_simq(mpt->sim, 1); @@ -865,7 +866,7 @@ request_t *req; int error; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { return (ENOMEM); } @@ -908,7 +909,7 @@ request_t *req; int error; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { return (ENOMEM); } ==== //depot/projects/mjacob-dev/sys/dev/mpt2sas/mpt2sas.c#6 (text+ko) ==== @@ -502,7 +502,8 @@ mpt2sas_ack_event(mpt2sas_t *mpt, MPI2_EVENT_NOTIFICATION_REPLY *reply) { MPI2_EVENT_ACK_REQUEST *rqs; - request_t *req = mpt2sas_get_request(mpt); + request_t *req; + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { mpt2sas_prt(mpt, MP2PRT_ERR, "%s: Unable to allocate request for Event=%x EventContext=%x\n", __func__, reply->Event, reply->EventContext); mpt->acks_needed = 1; @@ -1077,7 +1078,7 @@ mpt2sas_prt(mpt, MP2PRT_CONFIG, "%s: internal task management busy for handle 0x%x- retrying\n", __func__, hdl); return (EBUSY); } - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { mpt2sas_prt(mpt, MP2PRT_ERR, "%s: cannot allocate request\n", __func__); return (ENOBUFS); @@ -1129,7 +1130,7 @@ mpt = dp->mpt; mpt2sas_prt(mpt, MP2PRT_CONFIG, "%s: destroy DeviceHandle %x Phy %x active %u\n", __func__, dp->AttachedDevHandle, dp->PhyNum, dp->active); dp->destroy_needed = 0; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { mpt2sas_prt(mpt, MP2PRT_ERR, "%s: cannot allocate request\n", __func__); callout_reset(&dp->actions, 5, mpt2sas_destroy_dev_cb, dp); @@ -1195,7 +1196,7 @@ request_t *req; int error; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { return (ENOMEM); } @@ -1233,7 +1234,7 @@ mpt2sas_free_cfgbuf(mpt, off); return (error); } - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { mpt2sas_free_cfgbuf(mpt, off); return (ENOMEM); @@ -1275,7 +1276,7 @@ mpt2sas_free_cfgbuf(mpt, off); return (error); } - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { mpt2sas_free_cfgbuf(mpt, off); return (ENOMEM); @@ -1305,7 +1306,7 @@ } ptr->ReportDeviceMissingDelay = 3; ptr->IODeviceMissingDelay = 3; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { mpt2sas_free_cfgbuf(mpt, off); return (ENOMEM); @@ -1342,7 +1343,7 @@ if (error) { return (error); } - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { return (ENOMEM); } @@ -1383,7 +1384,7 @@ U8 fis[20]; uint32_t flags; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { return (ENOMEM); } @@ -1588,6 +1589,17 @@ mpt->nreq_allocated--; } +char * +mpt2sas_decode_request(mpt2sas_t *mpt, request_t *req, char *buf, size_t len) +{ + MPI2_REQUEST_HEADER *rqs = MPT2_REQ2RQS(mpt, req); + if (req->func) + snprintf(buf, len, "%p:%u opcode 0x%02x from %s:%u", req, req->serno, rqs->Function, req->func, req->lineno); + else + snprintf(buf, len, "%p:%u opcode 0x%02x", req, req->serno, rqs->Function); + return (buf); +} + request_t * mpt2sas_get_request(mpt2sas_t *mpt) { @@ -1597,6 +1609,7 @@ req->state = REQ_STATE_ALLOCATED; mpt2sas_assign_serno(mpt, req); mpt->nreq_allocated++; + req->func = NULL; } return (req); } @@ -1740,7 +1753,7 @@ request_t *req; int error; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { mpt2sas_prt(mpt, MP2PRT_ERR, "%s: unable to get request\n", __func__); return; @@ -1768,7 +1781,7 @@ MPI2_EVENT_NOTIFICATION_REQUEST *rqs; request_t *req; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { return (ENOMEM); } @@ -2108,7 +2121,7 @@ request_t *req; int error; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { return (ENOMEM); } @@ -2135,7 +2148,7 @@ request_t *req; int error; - req = mpt2sas_get_request(mpt); + MPT2SAS_GET_REQUEST(mpt, req); if (req == NULL) { return (ENOMEM); } @@ -2169,6 +2182,7 @@ uint32_t mselapsed; struct timeval now, save; request_t *req; + char buf[64]; struct topochg *tp; int r; @@ -2189,7 +2203,7 @@ } req->timeout = 0; req->state |= REQ_STATE_TIMEDOUT; - mpt2sas_prt(mpt, MP2PRT_ERR, "request %p:%u timed out\n", req, req->serno); + mpt2sas_prt(mpt, MP2PRT_ERR, "request %s timed out\n", mpt2sas_decode_request(mpt, req, buf, sizeof (buf))); if ((req->state & (REQ_STATE_NEED_CALLBACK|REQ_STATE_NEED_WAKEUP)) == 0 && req->ccb) { mpt2sas_scsi_abort(mpt, req); } ==== //depot/projects/mjacob-dev/sys/dev/mpt2sas/mpt2sas.h#7 (text+ko) ==== @@ -215,6 +215,7 @@ #define MPT2_APT_DLMASK 0x00ffff00 /* data length mask */ #define MPT2_APT_DLSHFT 8 /* shift */ +/* other definitions */ #define MPT2SAS_SYNC_ERR(m, e) \ if (e == ETIMEDOUT) { \ mpt2sas_prt(m, MP2PRT_ERR, "%s: request timed out (@line %d)\n", __func__, __LINE__); \ @@ -233,6 +234,13 @@ } \ do { ; } while (0) +#define MPT2SAS_GET_REQUEST(m, r) \ + if ((r = mpt2sas_get_request(m)) != NULL) { \ + r->func = __func__; \ + r->lineno = __LINE__ - 3; \ + } \ + do { ; } while (0) + /****************************** Global Data References ******************************/ extern struct mtx mpt2sas_global_lock; @@ -334,6 +342,8 @@ mpt2sas_dma_chunk_t * chain; /* dma chains */ bus_dmamap_t dmap; /* DMA map for data buffers */ uint32_t timeout; /* timeout in seconds */ + const char * func; + uint32_t lineno; }; /******************* SAS support structures ***********************************/ @@ -701,6 +711,7 @@ void mpt2sas_disable_ints(mpt2sas_t *); int mpt2sas_shutdown(mpt2sas_t *); int mpt2sas_handshake_cmd(mpt2sas_t *, size_t, void *, size_t, void *); +char * mpt2sas_decode_request(mpt2sas_t *, request_t *, char *, size_t); request_t * mpt2sas_get_request(mpt2sas_t *); void mpt2sas_free_request(mpt2sas_t *, request_t *); void mpt2sas_intr(void *); From owner-p4-projects@FreeBSD.ORG Thu Jul 21 14:45:14 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A854106567A; Thu, 21 Jul 2011 14:45: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 F26EB1065672 for ; Thu, 21 Jul 2011 14:45:13 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DEA138FC24 for ; Thu, 21 Jul 2011 14:45:13 +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 p6LEjDSt094139 for ; Thu, 21 Jul 2011 14:45:13 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6LEiqKb094114 for perforce@freebsd.org; Thu, 21 Jul 2011 14:44:52 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 21 Jul 2011 14:44:52 GMT Message-Id: <201107211444.p6LEiqKb094114@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196506 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 Jul 2011 14:45:14 -0000 http://p4web.freebsd.org/@@196506?ac=10 Change 196506 by mjacob@mjacob-sandbox on 2011/07/21 14:44:25 IFC Affected files ... .. //depot/projects/mjacob-dev/ObsoleteFiles.inc#6 integrate .. //depot/projects/mjacob-dev/UPDATING#7 integrate .. //depot/projects/mjacob-dev/bin/expr/expr.1#2 integrate .. //depot/projects/mjacob-dev/bin/expr/expr.y#2 integrate .. //depot/projects/mjacob-dev/bin/ps/keyword.c#4 integrate .. //depot/projects/mjacob-dev/bin/ps/print.c#5 integrate .. //depot/projects/mjacob-dev/bin/ps/ps.1#7 integrate .. //depot/projects/mjacob-dev/bin/sh/sh.1#8 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#3 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zpool/zpool.8#3 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/CHANGES#5 integrate .. //depot/projects/mjacob-dev/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/HISTORY#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/KNOWN-DEFECTS#2 delete .. //depot/projects/mjacob-dev/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/NSEC3-NOTES#2 delete .. //depot/projects/mjacob-dev/contrib/bind9/README#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/README.idnkit#3 delete .. //depot/projects/mjacob-dev/contrib/bind9/README.pkcs11#2 delete .. //depot/projects/mjacob-dev/contrib/bind9/acconfig.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/check-tool.h#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/ddns-confgen.8#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/ddns-confgen.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/ddns-confgen.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/ddns-confgen.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/include/confgen/os.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/keygen.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/keygen.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/rndc-confgen.8#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/rndc-confgen.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/rndc-confgen.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/rndc-confgen.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/unix/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/unix/os.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/util.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/confgen/util.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-revoke.8#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-revoke.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-revoke.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-revoke.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-settime.8#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-settime.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-settime.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-settime.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssectool.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/dnssec/dnssectool.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/bind.keys.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/bind9.xsl#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/bind9.xsl.h#2 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/builtin.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/config.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/log.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/lwdclient.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/main.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/notify.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/query.h#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/tsigconf.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/types.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/zoneconf.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/log.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/lwdgabn.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/lwdgrbn.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/statschannel.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/tkeyconf.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/tsigconf.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/unix/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/xfrout.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/nsupdate/nsupdate.1#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/include/rndc/os.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc-confgen.8#3 delete .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc-confgen.c#3 delete .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 delete .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc-confgen.html#3 delete .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/unix/Makefile.in#3 delete .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/unix/os.c#3 delete .. //depot/projects/mjacob-dev/contrib/bind9/bin/rndc/util.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/arpaname.1#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/arpaname.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/arpaname.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/arpaname.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/genrandom.8#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/genrandom.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/genrandom.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/genrandom.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/isc-hmac-fixup.8#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/isc-hmac-fixup.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/isc-hmac-fixup.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/isc-hmac-fixup.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/named-journalprint.8#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/named-journalprint.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/named-journalprint.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/named-journalprint.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/nsec3hash.8#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/nsec3hash.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/nsec3hash.docbook#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/bin/tools/nsec3hash.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/config.guess#2 integrate .. //depot/projects/mjacob-dev/contrib/bind9/config.h.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/configure.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/dnssec.xml#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/libdns.xml#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.arpaname.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.ddns-confgen.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.dnssec-revoke.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.dnssec-settime.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.genrandom.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.isc-hmac-fixup.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.named-journalprint.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.nsec3hash.html#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.nsupdate.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/managed-keys.xml#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/arm/pkcs11.xml#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/bind9/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/acl.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/byaddr.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/client.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/db.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/diff.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dlz.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dns64.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/ds.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dst_internal.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dst_openssl.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/dst_parse.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/ecdb.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/forward.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/gen-unix.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/gen.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/gssapi_link.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/gssapictx.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/hmac_link.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/acl.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/cache.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/client.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/compress.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/diff.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/dlz.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/dns64.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/dnssec.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/ds.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/ecdb.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/events.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/forward.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/journal.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/keydata.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/keytable.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/keyvalues.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/lib.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/log.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/lookup.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/master.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/masterdump.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/message.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/ncache.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/nsec3.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/peer.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/private.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/rbt.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/rdata.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/rdataset.h#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/request.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/result.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/rpz.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/rriterator.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/sdb.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/sdlz.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/secalg.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/soa.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/ssu.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/stats.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/tkey.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/tsec.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/tsig.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/view.h#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/xfrin.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dst/dst.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dst/gssapi.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/iptable.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/keydata.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/keytable.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/lib.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/log.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/ncache.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/nsec.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/nsec3.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/opensslgost_link.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/peer.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/private.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rcode.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/cert_37.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/cname_5.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/dname_39.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/hip_55.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/hip_55.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/key_25.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/keydata_65533.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/loc_29.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/mb_7.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/md_3.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/mf_4.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/mg_8.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/mr_9.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/mx_15.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/ns_2.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/null_10.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/opt_41.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/proforma.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/rp_17.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/rt_21.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/sig_24.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/soa_6.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/spf_99.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/generic/x25_19.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/a_1.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/px_26.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdatalist.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdataset.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/result.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rpz.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rriterator.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/sdlz.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/soa.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/spnego.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/ssu.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/ssu_external.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/stats.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/time.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/tsec.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/view.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/dns/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/dns/include/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/dns/include/dns/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/dns/include/dst/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/irs/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/irs/include/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/irs/include/irs/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/include/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/include/isc/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/include/isc/bind9.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/nls/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/nothreads/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/nothreads/include/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/pthreads/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/pthreads/include/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/unix/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/unix/include/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isccfg/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isccfg/include/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/samples/Makefile-postinstall.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/samples/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/samples/nsprobe.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/samples/sample-async.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/samples/sample-gai.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/samples/sample-request.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/samples/sample-update.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/export/samples/sample.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/api#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/context.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/dnsconf.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/gai_strerror.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/getaddrinfo.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/getnameinfo.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/irs/Makefile.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/irs/context.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/irs/dnsconf.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/irs/netdb.h.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/irs/platform.h.in#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/irs/resconf.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/irs/types.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/include/irs/version.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/resconf.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/irs/version.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/app_api.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/assertions.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/backtrace-emptytbl.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/backtrace.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/base32.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/base64.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/entropy.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/hash.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/hmacmd5.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/hmacsha.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/httpd.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/app.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/backtrace.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/bind9.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/buffer.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/entropy.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/error.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/file.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/fsaccess.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/hash.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/heap.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/hmacmd5.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/hmacsha.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/lib.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/log.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/md5.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/namespace.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/netaddr.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/netscope.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/portset.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/radix.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/random.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/ratelimiter.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/refcount.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/result.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/resultclass.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/serial.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/sha1.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/sha2.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/stats.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/symtab.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/task.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/types.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/include/isc/util.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/inet_aton.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/inet_ntop.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/iterated_hash.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/lib.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/log.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/md5.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/mem_api.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/netaddr.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/nls/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/nothreads/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/print.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/pthreads/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/radix.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/random.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/rwlock.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/sha1.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/sha2.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/sockaddr.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/socket_api.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/stats.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/task.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/task_api.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/task_p.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/timer_api.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/timer_p.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/dir.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/file.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/include/isc/net.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/include/isc/offset.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/include/isc/strerror.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/include/isc/time.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/interfaceiter.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/unix/strerror.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccc/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/Makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/aclconf.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/dnsconf.c#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/include/isccfg/dnsconf.h#1 branch .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/include/isccfg/log.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/isccfg/parser.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/context_p.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/include/lwres/context.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/lib/lwres/print_p.h#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/mjacob-dev/contrib/bind9/version#5 integrate .. //depot/projects/mjacob-dev/contrib/dialog/CHANGES#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/VERSION#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/aclocal.m4#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/arrows.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/buttons.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/calendar.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/checklist.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/columns.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/config.guess#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/config.sub#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/configure#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/configure.in#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/dialog.1#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/dialog.3#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/dialog.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/dialog.h#4 integrate .. //depot/projects/mjacob-dev/contrib/dialog/dlg_keys.h#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/editbox.c#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/formbox.c#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/fselect.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/guage.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/help.c#1 branch .. //depot/projects/mjacob-dev/contrib/dialog/inputbox.c#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/makefile.in#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/menubox.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/mixedgauge.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/msgbox.c#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/package/debian/changelog#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/package/debian/control#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/package/dialog.spec#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/pause.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/po/sk.po#1 branch .. //depot/projects/mjacob-dev/contrib/dialog/prgbox.c#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/progressbox.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/rc.c#2 integrate .. //depot/projects/mjacob-dev/contrib/dialog/samples/valgrind.log#1 branch .. //depot/projects/mjacob-dev/contrib/dialog/tailbox.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/textbox.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/timebox.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/trace.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/ui_getc.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/util.c#3 integrate .. //depot/projects/mjacob-dev/contrib/dialog/yesno.c#2 integrate .. //depot/projects/mjacob-dev/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/mjacob-dev/contrib/gcc/c.opt#2 integrate .. //depot/projects/mjacob-dev/contrib/gcc/common.opt#2 integrate .. //depot/projects/mjacob-dev/contrib/gcc/tree-nested.c#2 integrate .. //depot/projects/mjacob-dev/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm-c/Core.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm-c/Target.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm-c/Transforms/IPO.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ADT/APFloat.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ADT/APInt.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ADT/ArrayRef.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ADT/ImmutableList.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ADT/PackedVector.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ADT/SmallVector.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ADT/StringMap.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ADT/Triple.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/AbstractTypeUser.h#2 delete .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/BlockFrequency.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/BlockFrequencyImpl.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/DIBuilder.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/IVUsers.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/Passes.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Analysis/ValueTracking.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Assembly/Writer.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Attributes.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/BasicBlock.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/Analysis.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequency.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/Passes.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#3 delete .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/CodeGen/ValueTypes.td#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Constant.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Constants.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/DefaultPasses.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/DerivedTypes.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Function.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/GlobalAlias.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/GlobalValue.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/GlobalVariable.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/InitializePasses.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/InlineAsm.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Instructions.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Intrinsics.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Intrinsics.td#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/LLVMContext.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/LinkAllPasses.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCAsmInfo.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCContext.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCInstrDesc.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCInstrInfo.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCInstrItineraries.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCMachObjectWriter.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCObjectStreamer.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCRegisterInfo.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCStreamer.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/MCSubtargetInfo.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/MC/SubtargetFeature.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Module.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Object/Binary.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Object/COFF.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Object/Error.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Object/ObjectFile.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/BranchProbability.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/CFG.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/ConstantFolder.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/DebugLoc.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/ELF.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/Endian.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/IRBuilder.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/NoFolder.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/PassManagerBuilder.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/TargetFolder.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/TypeBuilder.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Support/system_error.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/SubtargetFeature.h#4 delete .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/Target.td#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetAsmInfo.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetAsmParser.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetData.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetFrameLowering.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#4 delete .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#5 delete .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetLowering.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetMachine.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetOpcodes.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetOptions.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetRegistry.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetSelect.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetSubtarget.h#2 delete .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Target/TargetSubtargetInfo.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Transforms/IPO.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Transforms/Scalar.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Type.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/TypeSymbolTable.h#4 delete .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Use.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/include/llvm/Value.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/Analysis.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/BlockFrequency.cpp#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/ConstantFolding.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/DIBuilder.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/DebugInfo.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/IVUsers.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/Lint.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/MemDepPrinter.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Analysis/ValueTracking.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/AsmParser/LLLexer.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/AsmParser/LLLexer.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/AsmParser/LLParser.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/AsmParser/LLParser.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/AsmParser/LLToken.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AllocationOrder.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/BranchFolding.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/BranchFolding.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/CodeGen.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/ELFWriter.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/ELFWriter.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/EdgeBundles.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/ExpandISelPseudos.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/IfConversion.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/InlineSpiller.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/InterferenceCache.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/InterferenceCache.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/LiveIntervalUnion.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineBlockFrequency.cpp#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineCSE.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineFunction.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineInstr.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineLICM.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#3 delete .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegisterClassInfo.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegisterClassInfo.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RegisterCoalescer.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/RenderMachineFunction.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#5 delete .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#5 delete .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SplitKit.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/SplitKit.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/Splitter.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/StackProtector.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/TailDuplication.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/VirtRegMap.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/ExecutionEngine/TargetSelect.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Linker/LinkModules.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCAsmInfo.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCAsmStreamer.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCDisassembler/Disassembler.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCDisassembler/EDInfo.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCDisassembler/EDOperand.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCDwarf.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCELFStreamer.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCELFStreamer.h#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCLoggingStreamer.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCMachOStreamer.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCNullStreamer.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCObjectStreamer.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCParser/COFFAsmParser.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCStreamer.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCSubtargetInfo.cpp#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MCWin64EH.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/MachObjectWriter.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/MC/SubtargetFeature.cpp#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/Object/Binary.cpp#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/Object/COFFObjectFile.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Object/ELFObjectFile.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Object/Error.cpp#1 branch .. //depot/projects/mjacob-dev/contrib/llvm/lib/Object/MachOObjectFile.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Object/Object.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Object/ObjectFile.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/APFloat.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/APInt.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/Atomic.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/CommandLine.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/ConstantRange.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/Host.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/Threading.cpp#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/Triple.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/Twine.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/Unix/Path.inc#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/Windows/DynamicLibrary.inc#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Support/Windows/explicit_symbols.inc#2 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARM.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARM.td#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMAsmBackend.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMBaseInfo.h#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp#4 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMGlobalMerge.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp#3 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMISelLowering.h#5 integrate .. //depot/projects/mjacob-dev/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 21 16:39:37 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D26F1065678; Thu, 21 Jul 2011 16:39: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 4C35E1065676 for ; Thu, 21 Jul 2011 16:39:37 +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 379E08FC1D for ; Thu, 21 Jul 2011 16:39: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 p6LGdbSN016837 for ; Thu, 21 Jul 2011 16:39:37 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6LGdHLS016830 for perforce@freebsd.org; Thu, 21 Jul 2011 16:39:17 GMT (envelope-from trasz@freebsd.org) Date: Thu, 21 Jul 2011 16:39:17 GMT Message-Id: <201107211639.p6LGdHLS016830@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 196512 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 Jul 2011 16:39:37 -0000 http://p4web.freebsd.org/@@196512?ac=10 Change 196512 by trasz@trasz_victim on 2011/07/21 16:38:20 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/Makefile#17 integrate .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#29 integrate .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#38 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#38 integrate .. //depot/projects/soc2009/trasz_limits/bin/expr/expr.1#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/expr/expr.y#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/extern.h#8 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/keyword.c#10 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/print.c#9 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/ps.1#14 integrate .. //depot/projects/soc2009/trasz_limits/bin/rcp/rcp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/realpath/realpath.1#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/realpath/realpath.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/alias.c#8 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/alias.h#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/arith.h#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/arith_yacc.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/bltin/bltin.h#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/cd.c#10 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/cd.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#22 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/eval.h#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/exec.h#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/expand.c#21 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/expand.h#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/histedit.c#13 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/jobs.c#14 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/jobs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/main.c#17 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/main.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/mkbuiltins#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/mkinit.c#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/mktokens#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/myhistedit.h#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/nodetypes#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/options.c#9 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/options.h#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#24 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.h#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#25 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/trap.c#10 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/trap.h#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.c#17 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.h#7 integrate .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/assert.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs.8#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#8 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool.8#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#8 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/ztest/ztest.c#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#8 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#9 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/CHANGES#13 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/COPYRIGHT#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/FAQ.xml#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/HISTORY#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/KNOWN-DEFECTS#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/NSEC3-NOTES#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/README#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/README.idnkit#4 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/README.pkcs11#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/acconfig.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.8#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.docbook#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.8#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.c#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.docbook#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/ddns-confgen.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/ddns-confgen.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/ddns-confgen.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/ddns-confgen.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/include/confgen/os.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/keygen.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/keygen.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/rndc-confgen.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/rndc-confgen.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/rndc-confgen.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/rndc-confgen.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/unix/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/unix/os.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/util.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/confgen/util.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.1#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.html#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-revoke.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-revoke.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-revoke.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-revoke.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-settime.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-settime.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-settime.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-settime.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.8#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.html#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssectool.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssectool.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/bind.keys.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/bind9.xsl#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/bind9.xsl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/builtin.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/control.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/client.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/config.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/control.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/globals.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/log.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/lwdclient.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/main.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/notify.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/query.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/server.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/tsigconf.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/types.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/zoneconf.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/interfacemgr.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/log.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwdgabn.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwdgrbn.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwresd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/main.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.conf.5#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.conf.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/query.c#9 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/server.c#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/statschannel.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/tkeyconf.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/tsigconf.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/unix/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/unix/include/named/os.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/update.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/xfrout.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/zoneconf.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.1#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.html#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/include/rndc/os.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc-confgen.8#5 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc-confgen.c#4 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc-confgen.docbook#4 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc-confgen.html#5 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.conf.5#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.conf.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/unix/Makefile.in#4 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/unix/os.c#4 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/util.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/arpaname.1#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/arpaname.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/arpaname.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/arpaname.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/genrandom.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/genrandom.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/genrandom.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/genrandom.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/isc-hmac-fixup.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/isc-hmac-fixup.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/isc-hmac-fixup.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/isc-hmac-fixup.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/named-journalprint.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/named-journalprint.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/named-journalprint.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/named-journalprint.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/nsec3hash.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/nsec3hash.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/nsec3hash.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/tools/nsec3hash.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/config.guess#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/config.h.in#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/configure.in#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch03.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch04.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch05.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch07.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch08.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch09.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch10.html#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.pdf#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/dnssec.xml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/libdns.xml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.arpaname.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.ddns-confgen.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dig.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-keygen.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-revoke.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-settime.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-signzone.html#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.genrandom.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.host.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.isc-hmac-fixup.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named-checkconf.html#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named-checkzone.html#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named-journalprint.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named.html#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.nsec3hash.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.nsupdate.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc-confgen.html#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc.conf.html#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc.html#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/managed-keys.xml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/pkcs11.xml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/Makefile.in#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/options#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/api#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/check.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/acl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/adb.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/api#11 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/byaddr.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/client.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/db.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/diff.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dlz.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dns64.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dnssec.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ds.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_api.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_internal.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_openssl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_parse.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_parse.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ecdb.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/forward.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gen-unix.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gen.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gssapi_link.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gssapictx.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/hmac_link.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/acl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/cache.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/client.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/compress.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/db.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/diff.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dlz.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dns64.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dnssec.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ds.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ecdb.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/events.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/forward.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/journal.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/keydata.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/keytable.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/keyvalues.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/lib.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/log.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/lookup.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/master.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/masterdump.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/message.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/name.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ncache.h#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/nsec3.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/peer.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/private.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rbt.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdata.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdataset.h#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/request.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/resolver.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/result.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rpz.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rriterator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/sdb.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/sdlz.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/secalg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/soa.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ssu.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/stats.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/tkey.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/tsec.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/tsig.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/types.h#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/validator.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/view.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/xfrin.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/zone.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dst/dst.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dst/gssapi.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/iptable.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/journal.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/keydata.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/keytable.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/lib.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/log.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/master.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/masterdump.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/name.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ncache.c#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/nsec.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/nsec3.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/opensslgost_link.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/opensslrsa_link.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/peer.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/private.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbt.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbtdb.c#9 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rcode.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/cert_37.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/cname_5.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dname_39.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ds_43.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/hip_55.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/hip_55.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/key_25.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/keydata_65533.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/loc_29.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mb_7.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/md_3.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mf_4.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mg_8.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mr_9.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mx_15.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ns_2.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/null_10.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/opt_41.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/proforma.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rp_17.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rt_21.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/sig_24.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/soa_6.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/spf_99.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/txt_16.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/x25_19.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/a_1.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/px_26.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdatalist.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdataset.c#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdataslab.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/request.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/resolver.c#9 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/result.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rootns.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rpz.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rriterator.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/sdb.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/sdlz.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/soa.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/spnego.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ssu.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ssu_external.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/stats.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/time.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/tsec.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/validator.c#11 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/view.c#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/zone.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/dns/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/dns/include/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/dns/include/dns/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/dns/include/dst/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/irs/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/irs/include/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/irs/include/irs/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/include/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/include/isc/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/include/isc/bind9.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/nls/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/nothreads/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/nothreads/include/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/pthreads/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/pthreads/include/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/unix/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/unix/include/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isccfg/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isccfg/include/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/samples/Makefile-postinstall.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/samples/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/samples/nsprobe.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/samples/sample-async.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/samples/sample-gai.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/samples/sample-request.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/samples/sample-update.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/export/samples/sample.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/api#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/context.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/dnsconf.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/gai_strerror.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/getaddrinfo.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/getnameinfo.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/irs/Makefile.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/irs/context.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/irs/dnsconf.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/irs/netdb.h.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/irs/platform.h.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/irs/resconf.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/irs/types.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/include/irs/version.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/resconf.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/irs/version.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/api#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/app_api.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/assertions.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/backtrace-emptytbl.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/backtrace.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/base32.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/base64.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/entropy.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/hash.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/heap.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/hmacmd5.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/hmacsha.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/httpd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/app.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/assertions.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/backtrace.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/bind9.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/buffer.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/entropy.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/error.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/file.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/fsaccess.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/hash.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/heap.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/hmacmd5.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/hmacsha.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/lib.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/log.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/md5.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/mem.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/msgs.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/namespace.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/netaddr.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/netscope.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/platform.h.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/portset.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/radix.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/random.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/ratelimiter.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/refcount.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/result.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/resultclass.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/serial.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/sha1.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/sha2.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/sockaddr.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/socket.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/stats.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/symtab.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/task.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/timer.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/types.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/util.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/inet_aton.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/inet_ntop.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/iterated_hash.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/lib.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/log.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/md5.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mem.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mem_api.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/netaddr.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nls/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nothreads/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/print.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/pthreads/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/pthreads/mutex.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/radix.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/random.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/rwlock.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/sha1.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/sha2.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/sockaddr.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/socket_api.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/stats.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/task.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/task_api.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/task_p.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/timer_api.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/timer_p.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/app.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/dir.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/entropy.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/file.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/include/isc/net.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/include/isc/offset.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/include/isc/strerror.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/include/isc/time.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/interfaceiter.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/resource.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/socket.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/socket_p.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/strerror.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccc/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccc/api#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/Makefile.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/aclconf.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/dnsconf.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/include/isccfg/dnsconf.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/include/isccfg/log.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/parser.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/context.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/context_p.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/getipnode.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/include/lwres/context.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/lwconfig.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_buffer.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_buffer.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_config.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_config.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_context.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_context.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gabn.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gabn.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gethostent.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gethostent.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getipnode.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getipnode.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gnba.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gnba.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_inetntop.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_inetntop.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_noop.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_noop.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_packet.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_packet.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_resutil.3#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_resutil.html#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/print_p.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/make/rules.in#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/version#13 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/coffcode.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/opncls.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/peicode.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/gas/config/obj-elf.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/gas/config/tc-arm.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/gas/frags.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/gas/subsegs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/ld/ldexp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/ld/sysdep.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/opcodes/i386-dis.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/CHANGES#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/VERSION#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/aclocal.m4#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/arrows.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/buttons.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/calendar.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/checklist.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/columns.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/config.guess#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/config.sub#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/configure#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/configure.in#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.1#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.3#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dlg_keys.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/editbox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/formbox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/fselect.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/guage.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/help.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/inputbox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/makefile.in#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/menubox.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/mixedgauge.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/msgbox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/changelog#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/control#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/dialog.spec#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/pause.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sk.po#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/prgbox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/progressbox.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/rc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/valgrind.log#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/tailbox.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/textbox.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/timebox.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/trace.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/ui_getc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/util.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/yesno.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/c.opt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/cfg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/common.opt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/output.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/rtl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/tree-nested.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/tree.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gdb/gdb/ppcfbsd-tdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gperf/src/gen-perf.cc#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gperf/src/key-list.cc#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/groff/tmac/doc-common#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/groff/tmac/doc-syms#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/groff/tmac/doc.tmac#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/NEWS#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/README#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/command.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/funcs.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/less.man#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/less.nro#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/lessecho.man#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/lessecho.nro#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/lesskey.man#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/lesskey.nro#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/optfunc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/opttbl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/less/version.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/libpcap/bpf/net/bpf_filter.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Core.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Disassembler.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Target.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Transforms/IPO.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/APFloat.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/APInt.h#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ArrayRef.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/FoldingSet.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ImmutableList.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/PackedVector.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallVector.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringMap.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringRef.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Triple.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/AbstractTypeUser.h#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/BlockFrequency.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/BlockFrequencyImpl.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/CallGraph.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DIBuilder.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DebugInfo.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/IVUsers.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Passes.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/RegionPass.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ValueTracking.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Argument.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Assembly/Writer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Attributes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/BasicBlock.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/Analysis.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/FastISel.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineBlockFrequency.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/Passes.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/PseudoSourceValue.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#4 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ValueTypes.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Common.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Constant.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Constants.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/DefaultPasses.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/DerivedTypes.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Function.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GlobalAlias.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GlobalValue.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GlobalVariable.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/InitializePasses.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/InlineAsm.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Instructions.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicInst.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Intrinsics.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Intrinsics.td#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsARM.td#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsX86.td#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsXCore.td#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LLVMContext.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LinkAllPasses.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAsmInfo.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCContext.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCDwarf.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCELFSymbolFlags.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCExpr.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCInstPrinter.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCInstrDesc.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCInstrInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCInstrItineraries.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCMachObjectWriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCObjectStreamer.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCRegisterInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCStreamer.h#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSubtargetInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCWin64EH.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/SubtargetFeature.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Metadata.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Module.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Object/Binary.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Object/COFF.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Object/Error.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Object/ObjectFile.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Operator.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/BranchProbability.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CFG.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Casting.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ConstantFolder.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CrashRecoveryContext.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DebugLoc.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Dwarf.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ELF.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Endian.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/IRBuilder.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MemoryBuffer.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/NoFolder.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PassManagerBuilder.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PatternMatch.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Program.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/SourceMgr.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/StandardPasses.h#5 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/TargetFolder.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/TypeBuilder.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Win64EH.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/system_error.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/SubtargetFeature.h#4 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/Target.td#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetAsmInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetAsmParser.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetData.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetFrameLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#6 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#5 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetLibraryInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetLowering.h#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetMachine.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetOpcodes.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetOptions.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetRegistry.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSelect.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSubtarget.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSubtargetInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/IPO.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Instrumentation.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Scalar.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/Local.h#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Type.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/TypeSymbolTable.h#4 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Use.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Value.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Analysis.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/BlockFrequency.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ConstantFolding.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DIBuilder.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DebugInfo.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IVUsers.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InlineCost.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LazyValueInfo.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Lint.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Loads.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/MemDepPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/RegionPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ValueTracking.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLLexer.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLLexer.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLParser.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLParser.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLToken.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AllocationOrder.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AllocationOrder.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AntiDepBreaker.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#7 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfTableException.cpp#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/BranchFolding.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/BranchFolding.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CallingConvLower.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CodeGen.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFWriter.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFWriter.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/EdgeBundles.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ExpandISelPseudos.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/IfConversion.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/InlineSpiller.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/InterferenceCache.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/InterferenceCache.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveDebugVariables.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveIntervalUnion.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveIntervalUnion.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 22 18:20:10 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C1F3106567D; Fri, 22 Jul 2011 18:20: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 50C2A1065674 for ; Fri, 22 Jul 2011 18:20:10 +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 6D8D88FC16 for ; Fri, 22 Jul 2011 18:20:02 +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 p6MIK2J9030422 for ; Fri, 22 Jul 2011 18:20:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6MIK1aO030419 for perforce@freebsd.org; Fri, 22 Jul 2011 18:20:01 GMT (envelope-from jhb@freebsd.org) Date: Fri, 22 Jul 2011 18:20:01 GMT Message-Id: <201107221820.p6MIK1aO030419@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 196555 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 Jul 2011 18:20:10 -0000 http://p4web.freebsd.org/@@196555?ac=10 Change 196555 by jhb@jhb_jhbbsd on 2011/07/22 18:19:55 IFC @196554 Affected files ... .. //depot/projects/pci/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/pci/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/pci/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/pci/sys/amd64/include/param.h#2 integrate .. //depot/projects/pci/sys/arm/arm/irq_dispatch.S#2 integrate .. //depot/projects/pci/sys/arm/include/param.h#2 integrate .. //depot/projects/pci/sys/arm/sa11x0/sa11x0_irq.S#2 integrate .. //depot/projects/pci/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/pci/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/pci/sys/boot/i386/boot2/Makefile#6 integrate .. //depot/projects/pci/sys/boot/i386/zfsboot/Makefile#6 integrate .. //depot/projects/pci/sys/boot/powerpc/ps3/Makefile#3 integrate .. //depot/projects/pci/sys/boot/powerpc/ps3/conf.c#2 integrate .. //depot/projects/pci/sys/boot/powerpc/ps3/devicename.c#2 integrate .. //depot/projects/pci/sys/boot/powerpc/ps3/lv1call.S#2 integrate .. //depot/projects/pci/sys/boot/powerpc/ps3/lv1call.h#2 integrate .. //depot/projects/pci/sys/boot/powerpc/ps3/main.c#2 integrate .. //depot/projects/pci/sys/boot/powerpc/ps3/ps3bus.h#1 branch .. //depot/projects/pci/sys/boot/powerpc/ps3/ps3devdesc.h#1 branch .. //depot/projects/pci/sys/boot/powerpc/ps3/ps3disk.c#1 branch .. //depot/projects/pci/sys/boot/powerpc/ps3/ps3repo.c#1 branch .. //depot/projects/pci/sys/boot/powerpc/ps3/ps3repo.h#1 branch .. //depot/projects/pci/sys/boot/powerpc/ps3/ps3stor.c#1 branch .. //depot/projects/pci/sys/boot/powerpc/ps3/ps3stor.h#1 branch .. //depot/projects/pci/sys/boot/powerpc/ps3/version#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate .. //depot/projects/pci/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/pci/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/pci/sys/conf/Makefile.mips#2 integrate .. //depot/projects/pci/sys/conf/NOTES#6 integrate .. //depot/projects/pci/sys/conf/files.i386#5 integrate .. //depot/projects/pci/sys/conf/options#8 integrate .. //depot/projects/pci/sys/conf/options.mips#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#27 integrate .. //depot/projects/pci/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/pci/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/pci/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_dfs/null/dfs_null.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain.c#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280.h#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#4 integrate .. //depot/projects/pci/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/pci/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/pci/sys/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/pci/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/pci/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/pci/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/pci/sys/dev/pci/pci.c#25 integrate .. //depot/projects/pci/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/pci/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/pci/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/pci/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/pci/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/pci/sys/dev/usb/net/if_mos.c#4 integrate .. //depot/projects/pci/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/pci/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/pci/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/pci/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/pci/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/pci/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_commonacl.c#3 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_commonkrpc.c#6 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_commonsubs.c#4 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_var.h#5 integrate .. //depot/projects/pci/sys/fs/nfs/nfsdport.h#2 integrate .. //depot/projects/pci/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#7 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clsubs.c#5 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clvnops.c#5 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdcache.c#3 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdkrpc.c#4 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdsubs.c#2 integrate .. //depot/projects/pci/sys/geom/geom.h#6 integrate .. //depot/projects/pci/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/pci/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/pci/sys/i386/i386/support.s#2 integrate .. //depot/projects/pci/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/pci/sys/i386/include/param.h#3 integrate .. //depot/projects/pci/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/pci/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/pci/sys/ia64/ia64/clock.c#4 integrate .. //depot/projects/pci/sys/ia64/ia64/efi.c#4 integrate .. //depot/projects/pci/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/pci/sys/ia64/ia64/locore.S#4 integrate .. //depot/projects/pci/sys/ia64/ia64/nexus.c#5 integrate .. //depot/projects/pci/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/pci/sys/ia64/include/efi.h#3 integrate .. //depot/projects/pci/sys/ia64/include/param.h#2 integrate .. //depot/projects/pci/sys/kern/kern_clock.c#3 integrate .. //depot/projects/pci/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/pci/sys/kern/kern_exec.c#3 integrate .. //depot/projects/pci/sys/kern/kern_intr.c#4 integrate .. //depot/projects/pci/sys/kern/kern_linker.c#3 integrate .. //depot/projects/pci/sys/kern/kern_mib.c#2 integrate .. //depot/projects/pci/sys/kern/kern_proc.c#4 integrate .. //depot/projects/pci/sys/kern/kern_resource.c#4 integrate .. //depot/projects/pci/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/pci/sys/kern/posix4_mib.c#2 integrate .. //depot/projects/pci/sys/kern/sched_ule.c#4 integrate .. //depot/projects/pci/sys/kern/subr_pcpu.c#4 integrate .. //depot/projects/pci/sys/kern/subr_smp.c#5 integrate .. //depot/projects/pci/sys/kern/sys_capability.c#4 integrate .. //depot/projects/pci/sys/kgssapi/gss_impl.c#3 integrate .. //depot/projects/pci/sys/mips/conf/XLP#1 branch .. //depot/projects/pci/sys/mips/conf/XLP64#1 branch .. //depot/projects/pci/sys/mips/conf/XLPN32#1 branch .. //depot/projects/pci/sys/mips/include/bus.h#2 integrate .. //depot/projects/pci/sys/mips/include/cpufunc.h#2 integrate .. //depot/projects/pci/sys/mips/include/intr_machdep.h#2 integrate .. //depot/projects/pci/sys/mips/include/param.h#2 integrate .. //depot/projects/pci/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/pci/sys/mips/mips/cache.c#2 integrate .. //depot/projects/pci/sys/mips/mips/cache_mipsNN.c#2 integrate .. //depot/projects/pci/sys/mips/mips/cpu.c#3 integrate .. //depot/projects/pci/sys/mips/mips/elf_trampoline.c#2 integrate .. //depot/projects/pci/sys/mips/mips/exception.S#2 integrate .. //depot/projects/pci/sys/mips/mips/locore.S#2 integrate .. //depot/projects/pci/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/pci/sys/mips/nlm/board.c#1 branch .. //depot/projects/pci/sys/mips/nlm/board.h#1 branch .. //depot/projects/pci/sys/mips/nlm/bus_space_rmi.c#1 branch .. //depot/projects/pci/sys/mips/nlm/clock.h#1 branch .. //depot/projects/pci/sys/mips/nlm/cms.c#1 branch .. //depot/projects/pci/sys/mips/nlm/files.xlp#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/bridge.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/cop0.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/cop2.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/cpucontrol.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/fmn.c#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/fmn.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/iomap.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/mips-extns.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/mmio.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/mmu.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/pic.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/sys.h#1 branch .. //depot/projects/pci/sys/mips/nlm/hal/uart.h#1 branch .. //depot/projects/pci/sys/mips/nlm/interrupt.h#1 branch .. //depot/projects/pci/sys/mips/nlm/intr_machdep.c#1 branch .. //depot/projects/pci/sys/mips/nlm/iodi.c#1 branch .. //depot/projects/pci/sys/mips/nlm/mpreset.S#1 branch .. //depot/projects/pci/sys/mips/nlm/msgring.h#1 branch .. //depot/projects/pci/sys/mips/nlm/std.xlp#1 branch .. //depot/projects/pci/sys/mips/nlm/tick.c#1 branch .. //depot/projects/pci/sys/mips/nlm/uart_bus_xlp_iodi.c#1 branch .. //depot/projects/pci/sys/mips/nlm/uart_cpu_mips_xlp.c#1 branch .. //depot/projects/pci/sys/mips/nlm/xlp.h#1 branch .. //depot/projects/pci/sys/mips/nlm/xlp_machdep.c#1 branch .. //depot/projects/pci/sys/net/if_var.h#4 integrate .. //depot/projects/pci/sys/net/radix.h#2 integrate .. //depot/projects/pci/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/pci/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/pci/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/pci/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/pci/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/pci/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/pci/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/pci/sys/powerpc/aim/locore32.S#4 integrate .. //depot/projects/pci/sys/powerpc/aim/locore64.S#4 integrate .. //depot/projects/pci/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/pci/sys/powerpc/include/param.h#3 integrate .. //depot/projects/pci/sys/security/audit/audit.h#2 integrate .. //depot/projects/pci/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/pci/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/pci/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/pci/sys/sparc64/include/param.h#2 integrate .. //depot/projects/pci/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/pci/sys/sparc64/sparc64/intr_machdep.c#4 integrate .. //depot/projects/pci/sys/sys/capability.h#3 integrate .. //depot/projects/pci/sys/sys/interrupt.h#3 integrate .. //depot/projects/pci/sys/sys/kbio.h#2 integrate .. //depot/projects/pci/sys/sys/param.h#7 integrate .. //depot/projects/pci/sys/sys/pcpu.h#4 integrate .. //depot/projects/pci/sys/sys/resourcevar.h#3 integrate .. //depot/projects/pci/sys/sys/sysctl.h#3 integrate .. //depot/projects/pci/sys/sys/user.h#4 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/pci/sys/x86/include/mptable.h#6 integrate .. //depot/projects/pci/sys/x86/x86/mptable.c#10 integrate Differences ... ==== //depot/projects/pci/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.185 2011/04/25 22:22:51 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.186 2011/07/18 15:19:40 attilio Exp $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -201,7 +201,6 @@ ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); -ASSYM(MAXCPU, MAXCPU); ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); ==== //depot/projects/pci/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.53 2011/06/07 08:46:13 attilio Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.54 2011/07/18 15:19:40 attilio Exp $ */ /* @@ -80,6 +80,11 @@ static int assign_cpu; #endif +u_long intrcnt[INTRCNT_COUNT]; +char intrnames[INTRCNT_COUNT * (MAXCOMLEN + 1)]; +size_t sintrcnt = sizeof(intrcnt); +size_t sintrnames = sizeof(intrnames); + static int intr_assign_cpu(void *arg, u_char cpu); static void intr_disable_src(void *arg); static void intr_init(void *__dummy); ==== //depot/projects/pci/sys/amd64/amd64/support.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.132 2010/11/26 08:11:43 uqs Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.133 2011/07/18 15:19:40 attilio Exp $ */ #include "opt_ddb.h" @@ -38,18 +38,6 @@ #include "assym.s" - .data - ALIGN_DATA - .globl intrcnt, eintrcnt -intrcnt: - .space INTRCNT_COUNT * 8 -eintrcnt: - - .globl intrnames, eintrnames -intrnames: - .space INTRCNT_COUNT * (MAXCOMLEN + 1) -eintrnames: - .text /* ==== //depot/projects/pci/sys/amd64/include/param.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.35 2010/07/22 09:13:49 kib Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.37 2011/07/19 13:00:30 attilio Exp $ */ @@ -64,7 +64,9 @@ #endif #if defined(SMP) || defined(KLD_MODULE) -#define MAXCPU 32 +#ifndef MAXCPU +#define MAXCPU 64 +#endif #else #define MAXCPU 1 #endif ==== //depot/projects/pci/sys/arm/arm/irq_dispatch.S#2 (text+ko) ==== @@ -72,7 +72,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.4 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.5 2011/07/18 15:19:40 attilio Exp $"); /* * irq_entry: @@ -102,14 +102,16 @@ .align 0 - .global _C_LABEL(intrnames), _C_LABEL(eintrnames) - .global _C_LABEL(intrcnt), _C_LABEL(eintrcnt) + .global _C_LABEL(intrnames), _C_LABEL(sintrnames) + .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt) _C_LABEL(intrnames): .space NIRQ * (MAXCOMLEN + 1) -_C_LABEL(eintrnames): _C_LABEL(intrcnt): .space NIRQ * 4 -_C_LABEL(eintrcnt): +_C_LABEL(sintrnames): + .word NIRQ * (MAXCOMLEN + 1) +_C_LABEL(sintrcnt): + .word NIRQ * 4 .global _C_LABEL(current_intr_depth) _C_LABEL(current_intr_depth): ==== //depot/projects/pci/sys/arm/include/param.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.18 2009/09/18 17:04:57 alc Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.19 2011/07/19 00:37:24 attilio Exp $ */ #ifndef _ARM_INCLUDE_PARAM_H_ @@ -61,7 +61,9 @@ #define MID_MACHINE MID_ARM6 #if defined(SMP) || defined(KLD_MODULE) +#ifndef MAXCPU #define MAXCPU 2 +#endif #else #define MAXCPU 1 #endif /* SMP || KLD_MODULE */ ==== //depot/projects/pci/sys/arm/sa11x0/sa11x0_irq.S#2 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irq.S,v 1.4 2010/02/16 21:59:17 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irq.S,v 1.5 2011/07/18 15:19:40 attilio Exp $"); Lcurrent_intr_depth: .word _C_LABEL(current_intr_depth) @@ -118,16 +118,11 @@ mov r1, #0xffffffff str r1, [r0, #(SAIPIC_MR)] mov pc, lr -#ifdef IRQSTATS -Lintrcnt: - .word _C_LABEL(intrcnt) -#endif - .global _C_LABEL(intrnames), _C_LABEL(eintrnames) - .global _C_LABEL(eintrcnt) + .global _C_LABEL(intrnames), _C_LABEL(sintrnames) _C_LABEL(intrnames): -_C_LABEL(eintrnames): -_C_LABEL(eintrcnt): +_C_LABEL(sintrnames): + .word 0 .globl _C_LABEL(intrcnt), _C_LABEL(sintrcnt) @@ -135,4 +130,4 @@ .space ICU_LEN*4 /* XXX Should be linked to number of interrupts */ _C_LABEL(sintrcnt): - .space 32*4 + .word ICU_LEN*4 ==== //depot/projects/pci/sys/boot/forth/loader.conf.5#3 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.31 2011/05/28 08:50:38 julian Exp $ -.Dd January 16, 2008 +.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.32 2011/07/20 15:18:24 jhb Exp $ +.Dd July 20, 2011 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -107,6 +107,9 @@ Name of the kernel to be loaded. If no kernel name is set, no additional modules will be loaded. +The name must be a subdirectory of +.Pa /boot +that contains a kernel. .It Ar kernel_options Flags to be passed to the kernel. .It Ar password @@ -190,7 +193,7 @@ .Dq spinning character (useful for embedded products and such). .It Va kernel -.Pq Dq Pa /boot/kernel/kernel +.Pq Dq kernel .It Va loader_conf_files .Pq Dq Pa /boot/loader.conf /boot/loader.conf.local .It Va splash_bmp_load ==== //depot/projects/pci/sys/boot/i386/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # Common defines for all of /sys/boot/i386/ # -# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.15 2011/01/05 22:24:33 dim Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.16 2011/07/17 13:50:21 dim Exp $ BINDIR?= /boot @@ -11,6 +11,7 @@ .if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 -march=i386 +ACFLAGS+= -m32 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 .endif ==== //depot/projects/pci/sys/boot/i386/boot2/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.70 2011/05/05 18:47:24 dim Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.71 2011/07/17 13:50:21 dim Exp $ .include @@ -89,6 +89,9 @@ ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s +.if ${CC:T:Mclang} == "clang" + ${CC} ${ACFLAGS} -c boot2.s +.endif SRCS= boot2.c boot2.h ==== //depot/projects/pci/sys/boot/i386/zfsboot/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/zfsboot/Makefile,v 1.14 2011/06/27 21:43:56 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/zfsboot/Makefile,v 1.15 2011/07/17 13:50:21 dim Exp $ .PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common @@ -86,6 +86,9 @@ ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} zfsboot.o: zfsboot.s +.if ${CC:T:Mclang} == "clang" + ${CC} ${ACFLAGS} -c zfsboot.s +.endif SRCS= zfsboot.c ==== //depot/projects/pci/sys/boot/powerpc/ps3/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/ps3/Makefile,v 1.3 2011/05/30 04:23:33 julian Exp $ +# $FreeBSD: src/sys/boot/powerpc/ps3/Makefile,v 1.4 2011/07/16 19:01:09 nwhitehorn Exp $ .include MK_SSP= no @@ -10,13 +10,13 @@ # Architecture-specific loader code SRCS= start.S conf.c metadata.c vers.c main.c devicename.c ppc64_elf_freebsd.c -SRCS+= lv1call.S ps3cons.c font.h ps3mmu.c ps3net.c +SRCS+= lv1call.S ps3cons.c font.h ps3mmu.c ps3net.c ps3repo.c ps3stor.c ps3disk.c SRCS+= ucmpdi2.c LOADER_DISK_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= yes -LOADER_EXT2FS_SUPPORT?= no +LOADER_EXT2FS_SUPPORT?= yes LOADER_NET_SUPPORT?= yes LOADER_NFS_SUPPORT?= yes LOADER_TFTP_SUPPORT?= no ==== //depot/projects/pci/sys/boot/powerpc/ps3/conf.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999 Michael Smith + * Copyright (C) 1999 Michael Smith * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/conf.c,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/conf.c,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $"); #include #include "bootstrap.h" @@ -34,6 +34,8 @@ #include "dev_net.h" #endif +extern struct devsw ps3disk; + /* * We could use linker sets for some or all of these, but * then we would have to control what ended up linked into @@ -46,10 +48,8 @@ /* Exported for libstand */ struct devsw *devsw[] = { #if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT) -#ifdef NOTYET &ps3disk, #endif -#endif #if defined(LOADER_NET_SUPPORT) &netdev, #endif ==== //depot/projects/pci/sys/boot/powerpc/ps3/devicename.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/devicename.c,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/devicename.c,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $"); #include @@ -33,8 +33,10 @@ #include #include "bootstrap.h" +#include "ps3.h" +#include "ps3devdesc.h" -static int ps3_parsedev(struct devdesc **dev, const char *devspec, +static int ps3_parsedev(struct ps3_devdesc **dev, const char *devspec, const char **path); /* @@ -45,7 +47,7 @@ int ps3_getdev(void **vdev, const char *devspec, const char **path) { - struct devdesc **dev = (struct devdesc **)vdev; + struct ps3_devdesc **dev = (struct ps3_devdesc **)vdev; int rv = 0; /* @@ -82,9 +84,9 @@ * */ static int -ps3_parsedev(struct devdesc **dev, const char *devspec, const char **path) +ps3_parsedev(struct ps3_devdesc **dev, const char *devspec, const char **path) { - struct devdesc *idev; + struct ps3_devdesc *idev; struct devsw *dv; char *cp; const char *np; @@ -104,7 +106,7 @@ } if (dv == NULL) return(ENOENT); - idev = malloc(sizeof(struct devdesc)); + idev = malloc(sizeof(struct ps3_devdesc)); err = 0; np = (devspec + strlen(dv->dv_name)); @@ -112,7 +114,6 @@ case DEVT_NONE: break; -#ifdef NOTYET case DEVT_DISK: unit = -1; pnum = -1; @@ -154,7 +155,6 @@ if (path != NULL) *path = (*cp == 0) ? cp : cp + 1; break; -#endif case DEVT_NET: /* @@ -188,7 +188,7 @@ char * ps3_fmtdev(void *vdev) { - struct devdesc *dev = (struct devdesc *)vdev; + struct ps3_devdesc *dev = (struct ps3_devdesc *)vdev; char *cp; static char buf[128]; @@ -197,7 +197,6 @@ strcpy(buf, "(no device)"); break; -#ifdef NOTYET case DEVT_DISK: cp = buf; cp += sprintf(cp, "%s%d", dev->d_dev->dv_name, dev->d_unit); @@ -212,7 +211,6 @@ strcat(cp, ":"); break; -#endif case DEVT_NET: sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit); @@ -227,7 +225,7 @@ int ps3_setcurrdev(struct env_var *ev, int flags, const void *value) { - struct devdesc *ncurr; + struct ps3_devdesc *ncurr; int rv; if ((rv = ps3_parsedev(&ncurr, value, NULL)) != 0) ==== //depot/projects/pci/sys/boot/powerpc/ps3/lv1call.S#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (C) 2010 Nathan Whitehorn + * Copyright (C) 2011 glevand (geoffrey.levand@mail.ru) * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,7 +23,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/powerpc/ps3/lv1call.S,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $ + * $FreeBSD: src/sys/boot/powerpc/ps3/lv1call.S,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $ */ /* Hypercall stubs. Note: this is all a hack and should die. */ @@ -163,7 +164,7 @@ sldi %r3,%r3,32 clrldi %r4,%r4,32 - ori %r3,%r3,%r4 + or %r3,%r3,%r4 clrldi %r4,%r5,32 clrldi %r5,%r6,32 @@ -254,3 +255,98 @@ mtlr %r0 blr +.global lv1_get_repository_node_value +lv1_get_repository_node_value: + mflr %r0 + stw %r0,4(%r1) + + sldi %r3,%r3,32 + clrldi %r4,%r4,32 + or %r3,%r3,%r4 + sldi %r4,%r5,32 + clrldi %r5,%r6,32 + or %r4,%r4,%r5 + sldi %r5,%r7,32 + clrldi %r6,%r8,32 + or %r5,%r5,%r6 + sldi %r6,%r9,32 + clrldi %r7,%r10,32 + or %r6,%r6,%r7 + lwz %r7,8(%r1) + lwz %r8,12(%r1) + sldi %r7,%r7,32 + or %r7,%r7,%r8 + + li %r11,91 + hc + extsw %r3,%r3 + + lwz %r6,16(%r1) + std %r4,0(%r6) + lwz %r6,20(%r1) + std %r5,0(%r6) + + lwz %r0,4(%r1) + mtlr %r0 + blr + +.global lv1_storage_read +lv1_storage_read: + mflr %r0 + stw %r0,4(%r1) + + sldi %r3,%r3,32 + clrldi %r4,%r4,32 + or %r3,%r3,%r4 + sldi %r4,%r5,32 + clrldi %r5,%r6,32 + or %r4,%r4,%r5 + sldi %r5,%r7,32 + clrldi %r6,%r8,32 + or %r5,%r5,%r6 + sldi %r6,%r9,32 + clrldi %r7,%r10,32 + or %r6,%r6,%r7 + lwz %r7,8(%r1) + lwz %r8,12(%r1) + sldi %r7,%r7,32 + or %r7,%r7,%r8 + lwz %r8,16(%r1) + lwz %r9,20(%r1) + sldi %r8,%r8,32 + or %r8,%r8,%r9 + + li %r11,245 + hc + extsw %r3,%r3 + + lwz %r5,24(%r1) + std %r4,0(%r5) + + lwz %r0,4(%r1) + mtlr %r0 + blr + +.global lv1_storage_check_async_status +lv1_storage_check_async_status: + mflr %r0 + stw %r0,4(%r1) + stw %r7,-4(%r1) + + sldi %r3,%r3,32 + clrldi %r4,%r4,32 + or %r3,%r3,%r4 + sldi %r4,%r5,32 + clrldi %r5,%r6,32 + or %r4,%r4,%r5 + + li %r11,254 + hc + extsw %r3,%r3 + + lwz %r5,-4(%r1) + std %r4,0(%r5) + + lwz %r0,4(%r1) + mtlr %r0 + blr ==== //depot/projects/pci/sys/boot/powerpc/ps3/lv1call.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/powerpc/ps3/lv1call.h,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $ + * $FreeBSD: src/sys/boot/powerpc/ps3/lv1call.h,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $ */ #ifndef _PS3_LV1CALL_H @@ -68,5 +68,13 @@ int lv1_net_stop_tx_dma(int bus, int dev, int); int lv1_net_stop_rx_dma(int bus, int dev, int); +int lv1_get_repository_node_value(uint64_t lpar_id, uint64_t n1, uint64_t n2, + uint64_t n3, uint64_t n4, uint64_t *v1, uint64_t *v2); + +int lv1_storage_read(uint64_t dev_id, uint64_t region_id, + uint64_t start_sector, uint64_t sector_count, + uint64_t flags, uint64_t buf, uint64_t *tag); +int lv1_storage_check_async_status(uint64_t dev_id, uint64_t tag, uint64_t *status); + #endif ==== //depot/projects/pci/sys/boot/powerpc/ps3/main.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (C) 2010 Nathan Whitehorn + * Copyright (C) 2011 glevand (geoffrey.levand@mail.ru) * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/main.c,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/main.c,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $"); #include #include @@ -35,6 +36,7 @@ #include "bootstrap.h" #include "lv1call.h" #include "ps3.h" +#include "ps3devdesc.h" struct arch_switch archsw; extern void *_end; @@ -58,7 +60,9 @@ { uint64_t maxmem = 0; void *heapbase; - int i; + int i, err; + struct ps3_devdesc currdev; + struct open_file f; lv1_get_physmem(&maxmem); @@ -78,9 +82,37 @@ /* * March through the device switch probing for things. */ - for (i = 0; devsw[i] != NULL; i++) - if (devsw[i]->dv_init != NULL) - (devsw[i]->dv_init)(); + for (i = 0; devsw[i] != NULL; i++) { + if (devsw[i]->dv_init != NULL) { + err = (devsw[i]->dv_init)(); + if (err) { + printf("\n%s: initialization failed err=%d\n", + devsw[i]->dv_name, err); + continue; + } + } + + printf("\nDevice: %s\n", devsw[i]->dv_name); + + currdev.d_dev = devsw[i]; + currdev.d_type = currdev.d_dev->dv_type; + + if (strcmp(devsw[i]->dv_name, "disk") == 0) { + f.f_devdata = &currdev; + currdev.d_unit = 3; + currdev.d_disk.pnum = 1; + currdev.d_disk.ptype = PTYPE_GPT; + + if (devsw[i]->dv_open(&f, &currdev) == 0) + break; + } + + if (strcmp(devsw[i]->dv_name, "net") == 0) + break; + } + + if (devsw[i] == NULL) + panic("No boot device found!"); /* * Get timebase at boot. @@ -98,8 +130,10 @@ printf("(%s, %s)\n", bootprog_maker, bootprog_date); printf("Memory: %lldKB\n", maxmem / 1024); - env_setenv("currdev", EV_VOLATILE, "net", ps3_setcurrdev, env_nounset); - env_setenv("loaddev", EV_VOLATILE, "net", env_noset, env_nounset); + env_setenv("currdev", EV_VOLATILE, ps3_fmtdev(&currdev), + ps3_setcurrdev, env_nounset); + env_setenv("loaddev", EV_VOLATILE, ps3_fmtdev(&currdev), env_noset, + env_nounset); setenv("LINES", "24", 1); setenv("hw.platform", "ps3", 1); ==== //depot/projects/pci/sys/boot/powerpc/ps3/version#2 (text+ko) ==== @@ -1,6 +1,8 @@ -$FreeBSD: src/sys/boot/powerpc/ps3/version,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $ +$FreeBSD: src/sys/boot/powerpc/ps3/version,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +0.3: Added GPT support to disk. +0.2: Added disk support. 0.1: Initial PS3/PowerPC version. ==== //depot/projects/pci/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 (text+ko) ==== @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ #include @@ -376,7 +377,7 @@ * by nfsace, assuming aclent_t -> nfsace semantics. */ static uint32_t -mode_to_ace_access(mode_t mode, int isdir, int isowner, int isallow) +mode_to_ace_access(mode_t mode, boolean_t isdir, int isowner, int isallow) { uint32_t access = 0; int haswriteperm = 0; @@ -419,7 +420,7 @@ access |= ACE_DELETE_CHILD; } /* exec */ - if (mode & 01) { + if (mode & S_IXOTH) { access |= ACE_EXECUTE; } @@ -670,7 +671,7 @@ } static int -convert_aent_to_ace(aclent_t *aclentp, int aclcnt, int isdir, +convert_aent_to_ace(aclent_t *aclentp, int aclcnt, boolean_t isdir, ace_t **retacep, int *retacecnt) { ace_t *acep; @@ -696,7 +697,7 @@ dfaclcnt = aclcnt - i; } - if (dfaclcnt && isdir == 0) { + if (dfaclcnt && !isdir) { return (EINVAL); } @@ -734,7 +735,7 @@ } static int -ace_mask_to_mode(uint32_t mask, o_mode_t *modep, int isdir) +ace_mask_to_mode(uint32_t mask, o_mode_t *modep, boolean_t isdir) { int error = 0; o_mode_t mode = 0; @@ -1031,7 +1032,7 @@ } static int -ace_allow_to_mode(uint32_t mask, o_mode_t *modep, int isdir) +ace_allow_to_mode(uint32_t mask, o_mode_t *modep, boolean_t isdir) { /* ACE_READ_ACL and ACE_READ_ATTRIBUTES must both be set */ if ((mask & (ACE_READ_ACL | ACE_READ_ATTRIBUTES)) != @@ -1044,7 +1045,7 @@ static int acevals_to_aent(acevals_t *vals, aclent_t *dest, ace_list_t *list, - uid_t owner, gid_t group, int isdir) + uid_t owner, gid_t group, boolean_t isdir) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 22 18:27:49 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FA041065675; Fri, 22 Jul 2011 18:27:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 616F0106564A for ; Fri, 22 Jul 2011 18:27:49 +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 4D2A38FC0C for ; Fri, 22 Jul 2011 18:27:49 +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 p6MIRnHC032209 for ; Fri, 22 Jul 2011 18:27:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6MIRgPo032202 for perforce@freebsd.org; Fri, 22 Jul 2011 18:27:42 GMT (envelope-from jhb@freebsd.org) Date: Fri, 22 Jul 2011 18:27:42 GMT Message-Id: <201107221827.p6MIRgPo032202@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 196557 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 Jul 2011 18:27:49 -0000 http://p4web.freebsd.org/@@196557?ac=10 Change 196557 by jhb@jhb_jhbbsd on 2011/07/22 18:26:54 IFC @196554 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#25 integrate .. //depot/projects/smpng/share/man/man9/copy.9#2 integrate .. //depot/projects/smpng/share/man/man9/fail.9#6 integrate .. //depot/projects/smpng/share/man/man9/ifnet.9#6 integrate .. //depot/projects/smpng/share/man/man9/uio.9#6 integrate .. //depot/projects/smpng/share/man/man9/vm_map.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_clean.9#2 delete .. //depot/projects/smpng/share/man/man9/vm_map_sync.9#1 branch .. //depot/projects/smpng/share/man/man9/vm_page_copy.9#2 delete .. //depot/projects/smpng/share/man/man9/vm_page_protect.9#2 delete .. //depot/projects/smpng/share/man/man9/vm_page_zero_fill.9#2 delete .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#20 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#34 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#43 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#78 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#117 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#25 integrate .. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#54 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#23 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#30 integrate .. //depot/projects/smpng/sys/amd64/include/pci_cfgreg.h#7 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#25 delete .. //depot/projects/smpng/sys/arm/arm/irq_dispatch.S#5 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#64 integrate .. //depot/projects/smpng/sys/arm/arm/sys_machdep.c#7 integrate .. //depot/projects/smpng/sys/arm/at91/at91_machdep.c#8 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#15 integrate .. //depot/projects/smpng/sys/arm/include/param.h#15 integrate .. //depot/projects/smpng/sys/arm/mv/common.c#10 integrate .. //depot/projects/smpng/sys/arm/mv/gpio.c#8 integrate .. //depot/projects/smpng/sys/arm/mv/mv_machdep.c#13 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#24 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#11 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irq.S#5 integrate .. //depot/projects/smpng/sys/boot/Makefile#37 integrate .. //depot/projects/smpng/sys/boot/Makefile.amd64#2 integrate .. //depot/projects/smpng/sys/boot/Makefile.arm#2 integrate .. //depot/projects/smpng/sys/boot/Makefile.powerpc#2 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#17 integrate .. //depot/projects/smpng/sys/boot/common/disk.c#1 branch .. //depot/projects/smpng/sys/boot/common/disk.h#1 branch .. //depot/projects/smpng/sys/boot/common/load_elf.c#21 integrate .. //depot/projects/smpng/sys/boot/common/reloc_elf.c#3 integrate .. //depot/projects/smpng/sys/boot/common/ufsread.c#16 integrate .. //depot/projects/smpng/sys/boot/ficl/amd64/sysdep.c#1 branch .. //depot/projects/smpng/sys/boot/ficl/amd64/sysdep.h#1 branch .. //depot/projects/smpng/sys/boot/forth/loader.conf.5#16 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile.inc#12 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#25 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#11 integrate .. //depot/projects/smpng/sys/boot/i386/zfsboot/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/i386/zfsboot/zfsldr.S#4 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/devicename.c#2 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/lv1call.S#2 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/lv1call.h#2 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/main.c#2 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/ps3bus.h#1 branch .. //depot/projects/smpng/sys/boot/powerpc/ps3/ps3devdesc.h#1 branch .. //depot/projects/smpng/sys/boot/powerpc/ps3/ps3disk.c#1 branch .. //depot/projects/smpng/sys/boot/powerpc/ps3/ps3repo.c#1 branch .. //depot/projects/smpng/sys/boot/powerpc/ps3/ps3repo.h#1 branch .. //depot/projects/smpng/sys/boot/powerpc/ps3/ps3stor.c#1 branch .. //depot/projects/smpng/sys/boot/powerpc/ps3/ps3stor.h#1 branch .. //depot/projects/smpng/sys/boot/powerpc/ps3/version#2 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#34 integrate .. //depot/projects/smpng/sys/boot/userboot/Makefile#1 branch .. //depot/projects/smpng/sys/boot/userboot/ficl/Makefile#1 branch .. //depot/projects/smpng/sys/boot/userboot/libstand/Makefile#1 branch .. //depot/projects/smpng/sys/boot/userboot/libstand/amd64/_setjmp.S#1 branch .. //depot/projects/smpng/sys/boot/userboot/test/Makefile#1 branch .. //depot/projects/smpng/sys/boot/userboot/test/test.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot.h#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/Makefile#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/autoload.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/bootinfo.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/bootinfo32.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/bootinfo64.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/conf.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/copy.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/devicename.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/elf32_freebsd.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/elf64_freebsd.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/host.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/libuserboot.h#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/main.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/userboot_cons.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/userboot_disk.c#1 branch .. //depot/projects/smpng/sys/boot/userboot/userboot/version#1 branch .. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#14 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#76 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#48 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_xpt.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#18 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#28 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#6 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#9 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dtrace_subr.c#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#15 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#67 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#66 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#66 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#67 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_systrace_args.c#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#71 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#35 integrate .. //depot/projects/smpng/sys/conf/Makefile.mips#6 integrate .. //depot/projects/smpng/sys/conf/NOTES#193 integrate .. //depot/projects/smpng/sys/conf/files#273 integrate .. //depot/projects/smpng/sys/conf/files.amd64#86 integrate .. //depot/projects/smpng/sys/conf/files.i386#146 integrate .. //depot/projects/smpng/sys/conf/files.ia64#70 integrate .. //depot/projects/smpng/sys/conf/files.mips#15 integrate .. //depot/projects/smpng/sys/conf/files.pc98#110 integrate .. //depot/projects/smpng/sys/conf/options#190 integrate .. //depot/projects/smpng/sys/conf/options.mips#8 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_red.c#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#20 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.h#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflow.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#30 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.h#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#43 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#20 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#38 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_lb.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_mtag.h#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#17 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_osfp.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ruleset.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_subr.c#11 delete .. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#8 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#133 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#57 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#34 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#34 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#49 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#81 integrate .. //depot/projects/smpng/sys/dev/adb/adb_kbd.c#4 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#19 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.h#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#8 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#60 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#80 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#76 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-acard.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-acerlabs.c#12 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-promise.c#14 integrate .. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#13 integrate .. //depot/projects/smpng/sys/dev/ath/ath_dfs/null/dfs_null.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.h#13 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_9287.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#14 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5112.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#11 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar2133.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#10 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#16 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9280.h#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#96 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_sysctl.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_sysctl.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#23 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#11 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#35 integrate .. //depot/projects/smpng/sys/dev/cas/if_cas.c#11 integrate .. //depot/projects/smpng/sys/dev/cas/if_casvar.h#4 integrate .. //depot/projects/smpng/sys/dev/dc/dcphy.c#11 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#28 integrate .. //depot/projects/smpng/sys/dev/dc/pnphy.c#9 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#27 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#33 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.h#16 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/et/if_et.c#8 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#45 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#101 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#48 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#28 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemreg.h#8 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#20 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#22 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#25 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#16 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#27 integrate .. //depot/projects/smpng/sys/dev/md/md.c#100 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#33 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_cam.c#5 integrate .. //depot/projects/smpng/sys/dev/mfi/mfireg.h#14 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#30 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#48 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#33 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#42 integrate .. //depot/projects/smpng/sys/dev/mxge/eth_z8e.h#9 integrate .. //depot/projects/smpng/sys/dev/mxge/ethp_z8e.h#9 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#43 integrate .. //depot/projects/smpng/sys/dev/mxge/rss_eth_z8e.h#9 integrate .. //depot/projects/smpng/sys/dev/mxge/rss_ethp_z8e.h#9 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#34 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#126 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#47 integrate .. //depot/projects/smpng/sys/dev/pci/pci_subr.c#1 branch .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#18 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#36 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#27 integrate .. //depot/projects/smpng/sys/dev/pty/pty.c#4 integrate .. //depot/projects/smpng/sys/dev/rt/if_rt.c#1 branch .. //depot/projects/smpng/sys/dev/rt/if_rtreg.h#1 branch .. //depot/projects/smpng/sys/dev/rt/if_rtvar.h#1 branch .. //depot/projects/smpng/sys/dev/sis/if_sis.c#13 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#38 integrate .. //depot/projects/smpng/sys/dev/sound/macio/i2s.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#42 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#10 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#81 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#26 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/input/atp.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/input/uep.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axereg.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_ipheth.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_mos.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_usie.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_usievar.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/uhso.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umcs.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_audio.c#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template_cdce.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_kbd.c#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template_modem.c#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template_mouse.c#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template_msc.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_mtp.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ioctl.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_lookup.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#168 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#35 integrate .. //depot/projects/smpng/sys/dev/usb/usbhid.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#21 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#14 integrate .. //depot/projects/smpng/sys/dev/vr/if_vr.c#10 integrate .. //depot/projects/smpng/sys/dev/vr/if_vrreg.h#4 integrate .. //depot/projects/smpng/sys/dev/xen/control/control.c#3 integrate .. //depot/projects/smpng/sys/dev/xl/if_xl.c#13 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#93 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonacl.c#8 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonkrpc.c#8 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonport.c#10 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonsubs.c#11 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_var.h#18 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsdport.h#6 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsport.h#16 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsproto.h#5 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#13 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clrpcops.c#13 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#16 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clsubs.c#11 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#21 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdcache.c#6 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdkrpc.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#22 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdserv.c#11 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsocket.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#18 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsubs.c#3 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#19 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#16 integrate .. //depot/projects/smpng/sys/geom/cache/g_cache.c#5 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#24 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#35 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#22 integrate .. //depot/projects/smpng/sys/geom/geom.h#60 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#45 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#63 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#29 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#13 integrate .. //depot/projects/smpng/sys/geom/label/g_label_gpt.c#4 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#45 integrate .. //depot/projects/smpng/sys/geom/mountver/g_mountver.c#4 integrate .. //depot/projects/smpng/sys/geom/multipath/g_multipath.c#10 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#14 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#19 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#15 integrate .. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#21 integrate .. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#16 integrate .. //depot/projects/smpng/sys/geom/raid/g_raid.c#2 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#46 integrate .. //depot/projects/smpng/sys/geom/sched/g_sched.c#5 integrate .. //depot/projects/smpng/sys/geom/sched/gs_rr.c#4 integrate .. //depot/projects/smpng/sys/geom/shsec/g_shsec.c#9 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#25 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#24 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#27 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_list.c#6 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#19 integrate .. //depot/projects/smpng/sys/geom/virstor/g_virstor.c#7 integrate .. //depot/projects/smpng/sys/i386/Makefile#5 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#43 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#138 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#157 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#30 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#59 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#102 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#16 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#48 integrate .. //depot/projects/smpng/sys/i386/include/param.h#26 integrate .. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#11 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#40 delete .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#23 integrate .. //depot/projects/smpng/sys/i386/xen/mptable.c#6 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#22 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#15 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#76 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#25 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_machdep.c#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/efi.c#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.S#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#49 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.S#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#133 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#53 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#25 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#103 integrate .. //depot/projects/smpng/sys/ia64/include/efi.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#27 integrate .. //depot/projects/smpng/sys/ia64/include/pcpu.h#14 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#33 integrate .. //depot/projects/smpng/sys/ia64/include/sf_buf.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/smp.h#16 integrate .. //depot/projects/smpng/sys/kern/Make.tags.inc#11 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#78 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#102 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#72 integrate .. //depot/projects/smpng/sys/kern/kern_clocksource.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#136 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#138 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#155 integrate .. //depot/projects/smpng/sys/kern/kern_fail.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#133 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#109 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#88 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#112 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#121 integrate .. //depot/projects/smpng/sys/kern/kern_racct.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_rctl.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_rmlock.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#61 integrate .. //depot/projects/smpng/sys/kern/posix4_mib.c#4 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#103 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#118 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#69 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#101 integrate .. //depot/projects/smpng/sys/kern/subr_uio.c#5 integrate .. //depot/projects/smpng/sys/kern/sys_capability.c#2 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#101 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#108 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#26 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#46 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#60 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#55 integrate .. //depot/projects/smpng/sys/kern/tty.c#106 integrate .. //depot/projects/smpng/sys/kern/tty_inq.c#7 integrate .. //depot/projects/smpng/sys/kern/tty_outq.c#6 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#30 integrate .. //depot/projects/smpng/sys/kern/tty_ttydisc.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_shm.c#12 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#143 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#135 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#139 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#108 integrate .. //depot/projects/smpng/sys/kern/vfs_mountroot.c#4 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#188 integrate .. //depot/projects/smpng/sys/kgssapi/gss_impl.c#3 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_chip.c#3 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_machdep.c#6 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_ohci.c#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_setup.c#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar724x_chip.c#3 integrate .. //depot/projects/smpng/sys/mips/atheros/ar91xx_chip.c#3 integrate .. //depot/projects/smpng/sys/mips/conf/RT305X#2 integrate .. //depot/projects/smpng/sys/mips/conf/RT305X.hints#2 integrate .. //depot/projects/smpng/sys/mips/conf/XLP#1 branch .. //depot/projects/smpng/sys/mips/conf/XLP64#1 branch .. //depot/projects/smpng/sys/mips/conf/XLPN32#1 branch .. //depot/projects/smpng/sys/mips/include/bus.h#7 integrate .. //depot/projects/smpng/sys/mips/include/cpufunc.h#10 integrate .. //depot/projects/smpng/sys/mips/include/intr_machdep.h#4 integrate .. //depot/projects/smpng/sys/mips/include/param.h#13 integrate .. //depot/projects/smpng/sys/mips/malta/gt_pci.c#8 integrate .. //depot/projects/smpng/sys/mips/mips/cache.c#4 integrate .. //depot/projects/smpng/sys/mips/mips/cache_mipsNN.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/cpu.c#8 integrate .. //depot/projects/smpng/sys/mips/mips/elf_trampoline.c#3 integrate .. //depot/projects/smpng/sys/mips/mips/exception.S#10 integrate .. //depot/projects/smpng/sys/mips/mips/genassym.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/locore.S#9 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#23 integrate .. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#18 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#31 integrate .. //depot/projects/smpng/sys/mips/mips/trap.c#13 integrate .. //depot/projects/smpng/sys/mips/nlm/board.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/board.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/bus_space_rmi.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/clock.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/cms.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/files.xlp#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/bridge.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/cop0.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/cop2.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/cpucontrol.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/fmn.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/fmn.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/iomap.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/mips-extns.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/mmio.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/mmu.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/pic.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/sys.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/hal/uart.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/interrupt.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/intr_machdep.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/iodi.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/mpreset.S#1 branch .. //depot/projects/smpng/sys/mips/nlm/msgring.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/std.xlp#1 branch .. //depot/projects/smpng/sys/mips/nlm/tick.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/uart_bus_xlp_iodi.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/uart_cpu_mips_xlp.c#1 branch .. //depot/projects/smpng/sys/mips/nlm/xlp.h#1 branch .. //depot/projects/smpng/sys/mips/nlm/xlp_machdep.c#1 branch .. //depot/projects/smpng/sys/mips/rmi/dev/xlr/rge.c#10 integrate .. //depot/projects/smpng/sys/mips/rmi/fmn.c#5 integrate .. //depot/projects/smpng/sys/mips/rmi/iodi.c#6 integrate .. //depot/projects/smpng/sys/mips/sentry5/s5_machdep.c#6 integrate .. //depot/projects/smpng/sys/mips/sibyte/sb_machdep.c#8 integrate .. //depot/projects/smpng/sys/modules/Makefile#184 integrate .. //depot/projects/smpng/sys/modules/cxgbe/if_cxgbe/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ipdivert/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/nfscl/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/nfscommon/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/pf/Makefile#18 integrate .. //depot/projects/smpng/sys/modules/pflog/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/pfsync/Makefile#4 branch .. //depot/projects/smpng/sys/modules/usb/Makefile#26 integrate .. //depot/projects/smpng/sys/modules/usb/template/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/usb/usie/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf_filter.c#15 integrate .. //depot/projects/smpng/sys/net/if.c#143 integrate .. //depot/projects/smpng/sys/net/if.h#49 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#29 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#30 integrate .. //depot/projects/smpng/sys/net/if_debug.c#2 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#111 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#39 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#26 integrate .. //depot/projects/smpng/sys/net/if_gif.c#59 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#37 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#21 integrate .. //depot/projects/smpng/sys/net/if_llatbl.h#11 integrate .. //depot/projects/smpng/sys/net/if_spppfr.c#4 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#46 integrate .. //depot/projects/smpng/sys/net/if_stf.c#54 integrate .. //depot/projects/smpng/sys/net/if_tun.c#73 integrate .. //depot/projects/smpng/sys/net/if_var.h#78 integrate .. //depot/projects/smpng/sys/net/radix.h#13 integrate .. //depot/projects/smpng/sys/net/route.c#61 integrate .. //depot/projects/smpng/sys/net/route.h#38 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ageq.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_dfs.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_power.c#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#41 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#51 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#30 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#16 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#23 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow_v9.c#2 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#19 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.h#11 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#40 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#73 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#48 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#45 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#53 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#92 integrate .. //depot/projects/smpng/sys/netinet/in.c#74 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#33 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#72 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#43 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#79 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#59 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#60 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#50 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dn_io.c#8 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw2.c#18 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_log.c#7 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_pfil.c#13 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_sockopt.c#7 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#14 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_ftp.c#9 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_local.h#8 integrate .. //depot/projects/smpng/sys/netinet/libalias/libalias.3#6 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#98 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#47 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#31 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#40 integrate .. //depot/projects/smpng/sys/netinet/tcp_lro.c#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#73 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#132 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.h#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#83 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#68 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#75 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#27 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#41 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#27 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#24 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#28 integrate .. //depot/projects/smpng/sys/nfs/bootp_subr.c#5 integrate .. //depot/projects/smpng/sys/pc98/cbus/pckbd.c#6 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#15 integrate .. //depot/projects/smpng/sys/powerpc/aim/copyinout.c#7 integrate .. //depot/projects/smpng/sys/powerpc/aim/locore32.S#3 integrate .. //depot/projects/smpng/sys/powerpc/aim/locore64.S#4 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#30 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#21 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#20 integrate .. //depot/projects/smpng/sys/powerpc/aim/mp_cpudep.c#10 integrate .. //depot/projects/smpng/sys/powerpc/aim/swtch32.S#4 integrate .. //depot/projects/smpng/sys/powerpc/aim/swtch64.S#5 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#17 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr32.S#4 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr64.S#6 integrate .. //depot/projects/smpng/sys/powerpc/booke/copyinout.c#3 integrate .. //depot/projects/smpng/sys/powerpc/booke/interrupt.c#7 integrate .. //depot/projects/smpng/sys/powerpc/booke/locore.S#10 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#26 integrate .. //depot/projects/smpng/sys/powerpc/booke/trap.c#8 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#74 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC64#9 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#23 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#18 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofwcall32.S#2 integrate .. //depot/projects/smpng/sys/powerpc/ofw/rtas.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/fcu.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#20 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#25 integrate .. //depot/projects/smpng/sys/powerpc/ps3/if_glc.c#2 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3-hvcall.h#2 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3-hvcall.master#2 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3bus.c#3 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3disk.c#2 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3pic.c#3 integrate .. //depot/projects/smpng/sys/security/audit/audit.h#15 integrate .. //depot/projects/smpng/sys/security/audit/audit_arg.c#20 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#21 integrate .. //depot/projects/smpng/sys/security/audit/audit_private.h#17 integrate .. //depot/projects/smpng/sys/sparc64/include/cache.h#18 integrate .. //depot/projects/smpng/sys/sparc64/include/cpu.h#19 integrate .. //depot/projects/smpng/sys/sparc64/include/param.h#25 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#42 integrate .. //depot/projects/smpng/sys/sparc64/include/tlb.h#21 integrate .. //depot/projects/smpng/sys/sparc64/include/tsb.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#23 integrate .. //depot/projects/smpng/sys/sparc64/pci/fire.c#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizo.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cheetah.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/counter.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#28 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/interrupt.S#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#38 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#111 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#49 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#97 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/spitfire.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/sys_machdep.c#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#61 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/zeus.c#2 integrate .. //depot/projects/smpng/sys/sys/_types.h#17 integrate .. //depot/projects/smpng/sys/sys/bus.h#46 integrate .. //depot/projects/smpng/sys/sys/capability.h#8 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#8 integrate .. //depot/projects/smpng/sys/sys/diskmbr.h#10 integrate .. //depot/projects/smpng/sys/sys/file.h#34 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#35 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#35 integrate .. //depot/projects/smpng/sys/sys/kbio.h#6 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#89 integrate .. //depot/projects/smpng/sys/sys/param.h#172 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#39 integrate .. //depot/projects/smpng/sys/sys/priv.h#30 integrate .. //depot/projects/smpng/sys/sys/proc.h#217 integrate .. //depot/projects/smpng/sys/sys/racct.h#3 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#34 integrate .. //depot/projects/smpng/sys/sys/sem.h#13 integrate .. //depot/projects/smpng/sys/sys/sockio.h#20 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#18 integrate .. //depot/projects/smpng/sys/sys/syscall.h#100 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#100 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#73 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#105 integrate .. //depot/projects/smpng/sys/sys/systm.h#105 integrate .. //depot/projects/smpng/sys/sys/timetc.h#15 integrate .. //depot/projects/smpng/sys/sys/tty.h#35 integrate .. //depot/projects/smpng/sys/sys/ttydevsw.h#5 integrate .. //depot/projects/smpng/sys/sys/types.h#43 integrate .. //depot/projects/smpng/sys/sys/uio.h#28 integrate .. //depot/projects/smpng/sys/sys/unistd.h#20 integrate .. //depot/projects/smpng/sys/sys/user.h#43 integrate .. //depot/projects/smpng/sys/sys/vnode.h#116 integrate .. //depot/projects/smpng/sys/teken/demo/teken_demo.c#2 integrate .. //depot/projects/smpng/sys/teken/gensequences#2 integrate .. //depot/projects/smpng/sys/teken/libteken/teken.3#3 integrate .. //depot/projects/smpng/sys/teken/teken.c#7 integrate .. //depot/projects/smpng/sys/teken/teken_subr.h#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#59 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#24 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#30 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#37 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#89 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#126 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#29 integrate .. //depot/projects/smpng/sys/ufs/ffs/softdep.h#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#31 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#24 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#35 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#89 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#44 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#88 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#75 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#115 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#90 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#121 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#45 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#122 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#85 integrate .. //depot/projects/smpng/sys/vm/vm_unix.c#16 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#80 integrate .. //depot/projects/smpng/sys/x86/include/mptable.h#2 integrate .. //depot/projects/smpng/sys/x86/include/pci_cfgreg.h#1 branch .. //depot/projects/smpng/sys/x86/pci/pci_bus.c#1 branch .. //depot/projects/smpng/sys/x86/x86/mptable.c#4 integrate .. //depot/projects/smpng/sys/x86/x86/mptable_pci.c#4 integrate .. //depot/projects/smpng/sys/x86/x86/tsc.c#5 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.391 2011/06/18 13:08:46 bz Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.394 2011/07/09 19:05:28 alc Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -296,7 +296,6 @@ vm_fault_prefault.9 \ vm_map.9 \ vm_map_check_protection.9 \ - vm_map_clean.9 \ vm_map_create.9 \ vm_map_delete.9 \ vm_map_entry_resize_free.9 \ @@ -314,11 +313,11 @@ vm_map_simplify_entry.9 \ vm_map_stack.9 \ vm_map_submap.9 \ + vm_map_sync.9 \ vm_map_wire.9 \ vm_page_alloc.9 \ vm_page_bits.9 \ vm_page_cache.9 \ - vm_page_copy.9 \ vm_page_deactivate.9 \ vm_page_dontneed.9 \ vm_page_flag.9 \ @@ -328,12 +327,10 @@ vm_page_insert.9 \ vm_page_io.9 \ vm_page_lookup.9 \ - vm_page_protect.9 \ vm_page_rename.9 \ vm_page_sleep_if_busy.9 \ vm_page_wakeup.9 \ vm_page_wire.9 \ - vm_page_zero_fill.9 \ vm_set_page_size.9 \ vn_fullpath.9 \ vn_isdisk.9 \ @@ -551,8 +548,10 @@ config_intrhook.9 config_intrhook_establish.9 MLINKS+=contigmalloc.9 contigfree.9 MLINKS+=copy.9 copyin.9 \ + copy.9 copyin_nofault.9 \ copy.9 copyinstr.9 \ copy.9 copyout.9 \ + copy.9 copyout_nofault.9 \ copy.9 copystr.9 MLINKS+=critical_enter.9 critical.9 \ critical_enter.9 critical_exit.9 @@ -1284,7 +1283,8 @@ uidinfo.9 uifree.9 \ uidinfo.9 uihashinit.9 \ uidinfo.9 uihold.9 -MLINKS+=uio.9 uiomove.9 +MLINKS+=uio.9 uiomove.9 \ + uio.9 uiomove_nofault.9 MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usbd_do_request_flags.9 \ usbdi.9 usbd_errstr.9 \ ==== //depot/projects/smpng/share/man/man9/copy.9#2 (text+ko) ==== @@ -32,15 +32,17 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/copy.9,v 1.15 2004/06/16 08:33:57 ru Exp $ +.\" $FreeBSD: src/share/man/man9/copy.9,v 1.16 2011/07/09 15:24:12 kib Exp $ .\" -.Dd January 7, 1996 +.Dd July 9, 2011 .Dt COPY 9 .Os .Sh NAME .Nm copy , .Nm copyin , +.Nm copyin_nofault , .Nm copyout , +.Nm copyout_nofault , .Nm copystr , .Nm copyinstr .Nd kernel copy functions @@ -50,8 +52,12 @@ .Ft int .Fn copyin "const void *uaddr" "void *kaddr" "size_t len" .Ft int +.Fn copyin_nofault "const void *uaddr" "void *kaddr" "size_t len" +.Ft int .Fn copyout "const void *kaddr" "void *uaddr" "size_t len" .Ft int +.Fn copyout_nofault "const void *kaddr" "void *uaddr" "size_t len" +.Ft int .Fn copystr "const void *kfaddr" "void *kdaddr" "size_t len" "size_t *done" .Ft int .Fn copyinstr "const void *uaddr" "void *kaddr" "size_t len" "size_t *done" @@ -67,25 +73,40 @@ copy data from user-space to kernel-space or vice-versa. .Pp The -.Nm -routines provide the following functionality: -.Bl -tag -width "copyoutstr()" -.It Fn copyin -Copies +.Fn copyin +and +.Fn copyin_nofault +functions copy .Fa len bytes of data from the user-space address .Fa uaddr to the kernel-space address .Fa kaddr . -.It Fn copyout -Copies +.Pp +The +.Fn copyout +and +.Fn copyout_nofault +functions copy .Fa len bytes of data from the kernel-space address .Fa kaddr to the user-space address .Fa uaddr . -.It Fn copystr -Copies a NUL-terminated string, at most +.Pp +The +.Fn copyin_nofault +and +.Fn copyout_nofault +functions require that the kernel-space and user-space data be +accessible without incurring a page fault. +The source and destination addresses must be physically mapped for +read and write access, respectively, and neither the source nor +destination addresses may be pageable. +.Pp +The +.Fn copystr +function copies a NUL-terminated string, at most .Fa len bytes long, from kernel-space address .Fa kfaddr @@ -98,8 +119,10 @@ .Fa done is .No non- Ns Dv NULL ) . -.It Fn copyinstr -Copies a NUL-terminated string, at most +.Pp +The +.Fn copyinstr +function copies a NUL-terminated string, at most .Fa len bytes long, from user-space address .Fa uaddr @@ -121,7 +144,6 @@ .\" The number of bytes actually copied, including the terminating .\" NUL, is returned in .\" .Fa *done . -.El .Sh RETURN VALUES The .Nm @@ -129,7 +151,13 @@ .Er EFAULT if a bad address is encountered. In addition, the -.Fn copystr , +.Fn copyin_nofault +and +.Fn copyout_nofault +functions return +.Er EFAULT +if a page fault occurs, and the +.Fn copystr and .Fn copyinstr .\" .Fn copyinstr , ==== //depot/projects/smpng/share/man/man9/fail.9#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/fail.9,v 1.6 2010/10/08 12:40:16 uqs Exp $ +.\" $FreeBSD: src/share/man/man9/fail.9,v 1.7 2011/07/08 20:41:12 mdf Exp $ .\" .Dd May 10, 2009 .Dt FAIL 9 @@ -116,6 +116,7 @@ ( ( "%") | ( "*" ) )* [ "(" ")" ] + [ "[pid " "]" ] :: [ "." ] | @@ -161,6 +162,10 @@ are the only types that cascade. A return() term only cascades if the code executes, and a print() term only cascades when passed a non-zero argument. +A pid can optionally be specified. +The fail point term is only executed when invoked by a process with a +matching p_pid. +.Pp .Sh EXAMPLES .Bl -tag .It Sy sysctl debug.fail_point.foobar="2.1%return(5)" @@ -181,6 +186,8 @@ Return 5 for 1 in 1000 executions, but only 5 times total. .It Sy sysctl debug.fail_point.foobar="1%*sleep(50)" 1/100th of the time, sleep 50ms. +.It Sy sysctl debug.fail_point.foobar="1*return(5)[pid 1234]" +Return 5 once, when pid 1234 executes the fail point. .El .Sh AUTHORS .An -nosplit ==== //depot/projects/smpng/share/man/man9/ifnet.9#6 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.58 2010/07/27 08:45:29 simon Exp $ +.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.59 2011/07/03 12:22:02 bz Exp $ .\" -.Dd December 1, 2009 +.Dd July 3, 2011 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 22 20:07:43 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F0041065675; Fri, 22 Jul 2011 20:07:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 083A91065670 for ; Fri, 22 Jul 2011 20:07:43 +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 E94EA8FC14 for ; Fri, 22 Jul 2011 20:07:42 +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 p6MK7gc3051290 for ; Fri, 22 Jul 2011 20:07:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6MK7gGR051287 for perforce@freebsd.org; Fri, 22 Jul 2011 20:07:42 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 22 Jul 2011 20:07:42 GMT Message-Id: <201107222007.p6MK7gGR051287@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 196561 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 Jul 2011 20:07:43 -0000 http://p4web.freebsd.org/@@196561?ac=10 Change 196561 by rene@rene_acer on 2011/07/22 20:06:38 network-servers: - sanity/spell fixes - update to future 1.135, which fixes file names from an example usage of dnssec-keygen. [1] Discussed with: gjb@ on bsddocs [1] Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#45 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#45 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.32 2011/05/28 09:38:36 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml - %SRCID% 1.134 + %SRCID% 1.135 --> @@ -4201,8 +4201,8 @@ DNS-records. Door digitale handtekeningen te gebruiken kan een resolver de integriteit van een record controleren. Merk op dat DNSSEC - alleen integriteit biedt via het digitaal ondertekenen van de Resource - Record (RRs). Het biedt noch + alleen integriteit biedt via het digitaal ondertekenen van het Resource + Record (RRs). Het biedt noch betrouwbaarheid noch bescherming tegen onjuiste aannames van eindgebruikers. Dit betekent dat het mensen niet kan beschermen tegen het bezoeken van voorbeeld.net in @@ -4223,7 +4223,7 @@ nodig om gebruik te kunnen maken van de ondertekende rootzones tijdens het valideren van DNS-verzoeken. Dit komt doordat eerdere versies de benodigde algoritmes om validatie met de sleutel - voor de rootzone te uit te veoren niet hebben. Het wordt sterk + voor de rootzone te uit te voeren niet hebben. Het wordt sterk aangeraden om de nieuwste versie van BIND 9.7 te gebruiken om gebruik te kunnen maken van automatische sleutel-updates voor de rootsleutel en van andere mogelijkheden om zones ondertekend en @@ -4311,7 +4311,7 @@ werken indien nodig. Dit wordt gedaan met managed-keys zoals in het volgende voorbeeld te zien is. Als de oudere versie gebruikt wordt, wordt de sleutel - toevoegd met een commando trusted-keys en dient + toegevoegd met een commando trusted-keys en dient deze handmatig bijgewerkt te worden. Voor BIND 9.6.2 ziet het formaat er uit als: @@ -4339,10 +4339,10 @@ QxA+Uk1ihz0="; }; - De root-sleutel kan nu aan named.conf worden + De rootsleutel kan nu aan named.conf worden toegevoegd, ofwel direct of door een bestand dat de sleutel bevat te includen. Stel na deze stappen BIND in zodat het - DNSSEC-validatie uitvoert op queries door + DNSSEC-validatie uitvoert op verzoeken door named.conf te bewerken en het volgende aan de directief options toe te voegen: @@ -4350,11 +4350,11 @@ dnssec-validation yes; Om te controleren dat het ook echt werkt, kan - dig gebruikt worden om een query op een + dig gebruikt worden om een verzoek op een ondertekende zone uit te voeren met de zojuist geconfigureerde resolver. Een succesvol antwoord zal de vlag AD bevatten om aan te geven dat de gegevens zijn geautenticeerd. Een - query als + verzoek als &prompt.user; dig @resolver +dnssec se ds @@ -4367,7 +4367,7 @@ ;; flags: qr rd ra ad; QUERY: 1, ANSWER: 3, AUTHORITY: 0, ADDITIONAL: 1 ... - De resolver is nu in staat om DNS-queries te + De resolver is nu in staat om DNS-verzoeken te autenticeren. @@ -4395,9 +4395,9 @@ operator. De KSK wordt gebruikt om een autoriteitsketen voor de te valideren gegevens op te bouwen en wordt daarom ook een Secure Entry Point (SEP)-sleutel genoemd. Een - message digest van deze sleutel, dat Delegation Signer (DS)-record genoemd wordt, moet + role="Secure Entry Point">SEP)-sleutel genoemd. Een + bericht-digest van deze sleutel, dat Delegation Signer (DS)-record genoemd wordt, moet gepubliceerd zijn in de ouderzone om een vertrouwensketen op te bouwen. Hoe dit bereikt wordt hangt af van de eigenaar van de ouderzone. De ZSK wordt @@ -4431,8 +4431,8 @@ sleutels per zone zijn. Het is ook mogelijk om de sleutels te hernoemen. Voor elk KSK-bestand: - &prompt.user; mv Kvoorbeeld.com+005+nnnnn.key Kvoorbeeld.com+005+nnnn.KSK.key -&prompt.user; mv Kvoorbeeld.com+005+nnnnn.private Kvoorbeeld.com+005+nnnnn.KSK.private + &prompt.user; mv Kvoorbeeld.com.+005+nnnnn.key Kvoorbeeld.com.+005+nnnn.KSK.key +&prompt.user; mv Kvoorbeeld.com.+005+nnnnn.private Kvoorbeeld.com.+005+nnnnn.KSK.private Voor ZSK-bestanden dient KSK waar nodig door ZSK vervangen te worden. De @@ -4440,19 +4440,18 @@ opdracht $include te gebruiken. Het zou er ongeveer als volgt uit moeten zien: - $include Kvoorbeeld.com.+005+nnnnn.KSK.key ; KSK $include Kvoorbeeld.com.+005+nnnnn.ZSK.key ; ZSK - Tenslotte, onderteken de zone en vertel BIND om + Onderteken tenslotte de zone en vertel BIND om het ondertekende zonebestand te gebruiken. Voor het ondertekenen van een zone wordt dnssec-signzone gebruikt. Het commando om de zone voorbeeld.com, dat zich in voorbeeld.com.db bevindt, zou er ongeveer zo - uitzien: + uit moeten zien: - &prompt.user; dnssec-signzone -o voorbeeld.com -k Kvoorbeeld.com+005+nnnnn.KSK voorbeeld.com.db Kvoorbeeld.com+005+nnnnn.ZSK.key + &prompt.user; dnssec-signzone -o voorbeeld.com -k Kvoorbeeld.com.+005+nnnnn.KSK voorbeeld.com.db Kvoorbeeld.com.+005+nnnnn.ZSK.key De sleutel die aan het argument wordt meegegeven is de KSK en het andere sleutelbestand @@ -4483,11 +4482,13 @@ oude sleutel te ondertekenen, en om daarna over te stappen op de nieuwe sleutel. Nadat deze handelingen zijn voltooid kan de oude sleutel uit de zone worden verwijderd. Wanneer dit niet wordt gedaan - kunnen de DNS-gegevens tijdelijk onbeschikbaar zijn totdat de nieuwe sleutel door de DNS-hierarchie is - gepropageerd. Meer informatie over sleutelwisselingen en andere + kunnen de DNS-gegevens tijdelijk onbeschikbaar zijn + totdat de nieuwe sleutel door de DNS-hiërarchie + is gepropageerd. Meer informatie over sleutelwisselingen en andere praktijken rondom DNSSEC staan in RFC - 4641: DNSSEC Operational practices. + 4641: DNSSEC Operational + practices. @@ -4562,7 +4563,7 @@ Verder lezen BIND/named hulppagina's: - &man.rndc.8;, &man.named.8;, &man.named.conf.5; &man.nsupdate.8; + &man.rndc.8; &man.named.8; &man.named.conf.5; &man.nsupdate.8; &man.dnssec-signzone.8; &man.dnssec-keygen.8; @@ -4598,38 +4599,38 @@ RFC1034 - - Domeinnamen - Concepten en Faciliteiten + Domain Names - Concepts and Facilitities RFC1035 - - Domeinnamen - Implementatie en Specificatie + Domain Names - Implementation and Specification RFC4033 - - DNS Beveiligingsintroductie en Benodigdheden + DNS Security Introduction and Requirements RFC4034 - - Resource Records voorde DNS-beveiligingsuitbreidingen + Resource Records for the DNS Security Extensions RFC4035 - - Protocolwijzigingen voor de DNS-beveiligingsuitbreidingen + Protocol Modifications for the DNS Security Extensions RFC4641 - - Operationeel gebruik van DNSSEC + DNSSEC Operational Practices RFC5011 - - Geautomatiseerde updates van DNS-beveiliging ( - DNSSEC Trust Anchors) + Automated Updates of DNS Security (DNSSEC Trust + Anchors)