From owner-p4-projects@FreeBSD.ORG Sun Jul 11 00:05:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05FAA16A4D0; Sun, 11 Jul 2004 00:05:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D53D616A4CE for ; Sun, 11 Jul 2004 00:05:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C88CE43D3F for ; Sun, 11 Jul 2004 00:05:10 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B05AiS047715 for ; Sun, 11 Jul 2004 00:05:10 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B05AVB047712 for perforce@freebsd.org; Sun, 11 Jul 2004 00:05:10 GMT (envelope-from marcel@freebsd.org) Date: Sun, 11 Jul 2004 00:05:10 GMT Message-Id: <200407110005.i6B05AVB047712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 00:05:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=57017 Change 57017 by marcel@marcel_nfs on 2004/07/11 00:04:57 Diff reduction ($FreeBSD$ fodder) Affected files ... .. //depot/projects/gdb/sys/ddb/db_main.c#10 edit .. //depot/projects/gdb/sys/ddb/db_thread.c#9 edit .. //depot/projects/gdb/sys/i386/i386/db_trace.c#11 edit Differences ... ==== //depot/projects/gdb/sys/ddb/db_main.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/ddb/db_main.c,v 1.1 2004/07/10 23:47:18 marcel Exp $"); #include #include ==== //depot/projects/gdb/sys/ddb/db_thread.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.1 2004/07/10 23:47:19 marcel Exp $"); #include #include ==== //depot/projects/gdb/sys/i386/i386/db_trace.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/db_trace.c,v 1.59 2003/11/03 22:07:21 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/db_trace.c,v 1.60 2004/07/10 23:47:19 marcel Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Sun Jul 11 00:31:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D03E716A4D0; Sun, 11 Jul 2004 00:31:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 952C116A4CE for ; Sun, 11 Jul 2004 00:31:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E28D43D31 for ; Sun, 11 Jul 2004 00:31:43 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B0VhQj048488 for ; Sun, 11 Jul 2004 00:31:43 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B0Vh4g048485 for perforce@freebsd.org; Sun, 11 Jul 2004 00:31:43 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 00:31:43 GMT Message-Id: <200407110031.i6B0Vh4g048485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 00:31:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=57019 Change 57019 by davidxu@davidxu_alona on 2004/07/11 00:31:31 Check debugger suspension request after resuming. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#6 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#6 (text+ko) ==== @@ -2038,6 +2038,7 @@ td0->td_flags |= TDF_ASTPENDING; } } +stopme: thread_stopped(p); thread_suspend_one(td); PROC_UNLOCK(p); @@ -2046,6 +2047,12 @@ mtx_unlock_spin(&sched_lock); PICKUP_GIANT(); PROC_LOCK(p); + if (td->td_flags & TDF_DBSUSPEND) { + if (p->p_flag & P_SINGLE_EXIT) + break; + mtx_lock_spin(&sched_lock); + goto stopme; + } } return (td->td_xsig); } From owner-p4-projects@FreeBSD.ORG Sun Jul 11 01:53:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 974FA16A4D0; Sun, 11 Jul 2004 01:53:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B7B116A4CE for ; Sun, 11 Jul 2004 01:53:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61C7343D2D for ; Sun, 11 Jul 2004 01:53:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B1rP8q051888 for ; Sun, 11 Jul 2004 01:53:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B1rOKK051885 for perforce@freebsd.org; Sun, 11 Jul 2004 01:53:24 GMT (envelope-from marcel@freebsd.org) Date: Sun, 11 Jul 2004 01:53:24 GMT Message-Id: <200407110153.i6B1rOKK051885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 01:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=57027 Change 57027 by marcel@marcel_nfs on 2004/07/11 01:52:31 IFC @57026 Affected files ... .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#16 integrate .. //depot/projects/gdb/sys/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/gdb/sys/conf/NOTES#32 integrate .. //depot/projects/gdb/sys/conf/files.powerpc#4 integrate .. //depot/projects/gdb/sys/conf/options#31 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pccard.c#6 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#21 integrate .. //depot/projects/gdb/usr.bin/hexdump/conv.c#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/display.c#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/hexdump.h#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/od.1#3 integrate Differences ... ==== //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.56 2004/06/07 01:22:48 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.57 2004/07/11 00:19:30 wpaul Exp $"); #include #include @@ -853,7 +853,8 @@ rl->cprl_count = sc->ndis_rescnt; prd = rl->cprl_partial_descs; - brl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev); + brl = BUS_GET_RESOURCE_LIST(dev, dev); + if (brl != NULL) { /* ==== //depot/projects/gdb/sys/compat/ndis/ndis_var.h#8 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.26 2004/07/07 17:46:29 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.27 2004/07/11 00:19:30 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1500,6 +1500,7 @@ extern int ndis_send_packet(void *, ndis_packet *); extern int ndis_convert_res(void *); extern int ndis_alloc_amem(void *); +extern void ndis_free_amem(void *); extern void ndis_free_packet(ndis_packet *); extern void ndis_free_bufs(ndis_buffer *); extern int ndis_reset_nic(void *); @@ -1520,6 +1521,7 @@ extern int ndis_unsched(void (*)(void *), void *, int); extern int ndis_thsuspend(struct proc *, int); extern void ndis_thresume(struct proc *); +extern int ndis_strcasecmp(const char *, const char *); __END_DECLS #endif /* _NDIS_VAR_H_ */ ==== //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.61 2004/07/07 17:46:29 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.62 2004/07/11 00:19:30 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -130,7 +130,6 @@ struct sysctl_oid *, ndis_parm_type, ndis_config_parm **); static ndis_status ndis_decode_parm(ndis_miniport_block *, ndis_config_parm *, char *); -static int my_strcasecmp(const char *, const char *); __stdcall static void ndis_read_cfg(ndis_status *, ndis_config_parm **, ndis_handle, ndis_unicode_string *, ndis_parm_type); __stdcall static void ndis_write_cfg(ndis_status *, ndis_handle, @@ -556,8 +555,8 @@ return(NDIS_STATUS_SUCCESS); } -static int -my_strcasecmp(s1, s2) +int +ndis_strcasecmp(s1, s2) const char *s1; const char *s2; { @@ -619,7 +618,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (my_strcasecmp(oidp->oid_name, keystr) == 0) { + if (ndis_strcasecmp(oidp->oid_name, keystr) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { free(keystr, M_DEVBUF); *status = NDIS_STATUS_FAILURE; @@ -719,7 +718,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (my_strcasecmp(oidp->oid_name, keystr) == 0) { + if (ndis_strcasecmp(oidp->oid_name, keystr) == 0) { /* Found it, set the value. */ strcpy((char *)oidp->oid_arg1, val); free(keystr, M_DEVBUF); @@ -885,6 +884,7 @@ uint16_t flags; char msgbuf[ERRMSGLEN]; + block = (ndis_miniport_block *)adapter; error = pe_get_message(block->nmb_img, code, &str, &i, &flags); @@ -1478,6 +1478,9 @@ else if (sc->ndis_res_altmem != NULL && paddr.np_quad == rman_get_start(sc->ndis_res_altmem)) *vaddr = (void *)rman_get_virtual(sc->ndis_res_altmem); + else if (sc->ndis_res_am != NULL && + paddr.np_quad == rman_get_start(sc->ndis_res_am)) + *vaddr = (void *)rman_get_virtual(sc->ndis_res_am); else return(NDIS_STATUS_FAILURE); @@ -2244,7 +2247,7 @@ bt = rman_get_bustag(sc->ndis_res_am); for (i = 0; i < len; i++) - dest[i] = bus_space_read_1(bt, bh, (offset * 2) + (i * 2)); + dest[i] = bus_space_read_1(bt, bh, (offset + i) * 2); return(i); } @@ -2274,7 +2277,7 @@ bt = rman_get_bustag(sc->ndis_res_am); for (i = 0; i < len; i++) - bus_space_write_1(bt, bh, (offset * 2) + (i * 2), src[i]); + bus_space_write_1(bt, bh, (offset + i) * 2, src[i]); return(i); } @@ -2584,7 +2587,7 @@ NDFREE(&nd, NDF_ONLY_PNBUF); /* Get the file size. */ - VOP_GETATTR(nd.ni_vp, vap, NOCRED, td); + VOP_GETATTR(nd.ni_vp, vap, td->td_ucred, td); VOP_UNLOCK(nd.ni_vp, 0, td); mtx_unlock(&Giant); @@ -2593,6 +2596,7 @@ *filehandle = fh; *filelength = fh->nf_maplen = vap->va_size & 0xFFFFFFFF; *status = NDIS_STATUS_SUCCESS; + return; } ==== //depot/projects/gdb/sys/conf/NOTES#32 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1243 2004/07/08 22:35:34 brian Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1244 2004/07/11 01:44:07 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # ==== //depot/projects/gdb/sys/conf/files.powerpc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.37 2004/03/23 18:26:02 alc Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.38 2004/07/11 01:38:25 grehan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -27,6 +27,7 @@ dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc geom/geom_apple.c standard +kern/syscalls.c optional ktr powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard powerpc/powerpc/bcopy.c standard ==== //depot/projects/gdb/sys/conf/options#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.463 2004/07/10 19:34:06 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.464 2004/07/11 01:44:07 marcel Exp $ # # On the handling of kernel options # @@ -30,15 +30,6 @@ # If filename is missing, the default is # opt_.h -# XXX temporary -GDB -KDB opt_global.h -KDB_TRACE opt_kdb.h -KDB_UNATTENDED opt_kdb.h -WITNESS_KDB opt_witness.h -SC_DISABLE_KDBKEY opt_syscons.h - - AAC_DEBUG opt_aac.h AHC_ALLOW_MEMIO opt_aic7xxx.h AHC_TMODE_ENABLE opt_aic7xxx.h ==== //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pccard.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.5 2004/06/01 23:27:36 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.6 2004/07/11 00:19:30 wpaul Exp $"); #include #include @@ -85,14 +85,14 @@ static int ndis_probe_pccard (device_t); static int ndis_attach_pccard (device_t); +static struct resource_list *ndis_get_resource_list + (device_t, device_t); extern int ndis_attach (device_t); extern int ndis_shutdown (device_t); extern int ndis_detach (device_t); extern int ndis_suspend (device_t); extern int ndis_resume (device_t); -static int my_strcasecmp (const char *, const char *, int); - extern struct mtx_pool *ndis_mtxpool; static device_method_t ndis_methods[] = { @@ -104,6 +104,15 @@ DEVMETHOD(device_suspend, ndis_suspend), DEVMETHOD(device_resume, ndis_resume), + /* Bus interface. */ + + /* + * This is an awful kludge, but we need it becase pccard + * does not implement a bus_get_resource_list() method. + */ + + DEVMETHOD(bus_get_resource_list, ndis_get_resource_list), + { 0, 0 } }; @@ -127,22 +136,6 @@ DRIVER_MODULE(ndis, pccard, ndis_driver, ndis_devclass, 0, 0); #endif -static int my_strcasecmp(s1, s2, len) - const char *s1; - const char *s2; - int len; -{ - int i; - - for (i = 0; i < len; i++) { - if (toupper(s1[i]) != toupper(s2[i])) - return(0); - } - - return(1); -} - - /* * Probe for an NDIS device. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. @@ -165,8 +158,8 @@ return(error); while(t->ndis_name != NULL) { - if (my_strcasecmp(vendstr, t->ndis_vid, strlen(vendstr)) && - my_strcasecmp(prodstr, t->ndis_did, strlen(prodstr))) { + if (ndis_strcasecmp(vendstr, t->ndis_vid) == 0 && + ndis_strcasecmp(prodstr, t->ndis_did) == 0) { device_set_desc(dev, t->ndis_name); return(0); } @@ -193,6 +186,7 @@ sc = device_get_softc(dev); unit = device_get_unit(dev); sc->ndis_dev = dev; + resource_list_init(&sc->ndis_rl); sc->ndis_io_rid = 0; sc->ndis_res_io = bus_alloc_resource(dev, @@ -205,6 +199,9 @@ goto fail; } sc->ndis_rescnt++; + resource_list_add(&sc->ndis_rl, SYS_RES_IOPORT, rid, + rman_get_start(sc->ndis_res_io), rman_get_end(sc->ndis_res_io), + rman_get_size(sc->ndis_res_io)); rid = 0; sc->ndis_irq = bus_alloc_resource(dev, @@ -217,6 +214,8 @@ goto fail; } sc->ndis_rescnt++; + resource_list_add(&sc->ndis_rl, SYS_RES_IRQ, rid, + rman_get_start(sc->ndis_irq), rman_get_start(sc->ndis_irq), 1); sc->ndis_iftype = PCMCIABus; @@ -232,8 +231,8 @@ return(error); while(t->ndis_name != NULL) { - if (my_strcasecmp(vendstr, t->ndis_vid, strlen(vendstr)) && - my_strcasecmp(prodstr, t->ndis_did, strlen(prodstr))) + if (ndis_strcasecmp(vendstr, t->ndis_vid) == 0 && + ndis_strcasecmp(prodstr, t->ndis_did) == 0) break; t++; devidx++; @@ -247,6 +246,17 @@ return(error); } +static struct resource_list * +ndis_get_resource_list(dev, child) + device_t dev; + device_t child; +{ + struct ndis_softc *sc; + + sc = device_get_softc(dev); + return (&sc->ndis_rl); +} + #endif /* NDIS_PCI_DEV_TABLE */ #define NDIS_AM_RID 3 @@ -271,6 +281,10 @@ "failed to allocate attribute memory\n"); return(ENXIO); } + sc->ndis_rescnt++; + resource_list_add(&sc->ndis_rl, SYS_RES_MEMORY, rid, + rman_get_start(sc->ndis_res_am), rman_get_end(sc->ndis_res_am), + rman_get_size(sc->ndis_res_am)); error = CARD_SET_MEMORY_OFFSET(device_get_parent(sc->ndis_dev), sc->ndis_dev, rid, 0, NULL); @@ -290,5 +304,26 @@ return(error); } + sc->ndis_am_rid = rid; + return(0); } + +void +ndis_free_amem(arg) + void *arg; +{ + struct ndis_softc *sc; + + if (arg == NULL) + return; + + sc = arg; + + if (sc->ndis_res_am != NULL) + bus_release_resource(sc->ndis_dev, SYS_RES_MEMORY, + sc->ndis_am_rid, sc->ndis_res_am); + resource_list_free(&sc->ndis_rl); + + return; +} ==== //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pci.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.6 2004/06/01 23:27:36 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.7 2004/07/11 00:19:30 wpaul Exp $"); #include #include @@ -84,6 +84,8 @@ static int ndis_probe_pci (device_t); static int ndis_attach_pci (device_t); +static struct resource_list *ndis_get_resource_list + (device_t, device_t); extern int ndis_attach (device_t); extern int ndis_shutdown (device_t); extern int ndis_detach (device_t); @@ -101,6 +103,9 @@ DEVMETHOD(device_suspend, ndis_suspend), DEVMETHOD(device_resume, ndis_resume), + /* Bus interface */ + DEVMETHOD(bus_get_resource_list, ndis_get_resource_list), + { 0, 0 } }; @@ -321,4 +326,15 @@ return(error); } +static struct resource_list * +ndis_get_resource_list(dev, child) + device_t dev; + device_t child; +{ + struct ndis_softc *sc; + + sc = device_get_softc(dev); + return (BUS_GET_RESOURCE_LIST(device_get_parent(sc->ndis_dev), dev)); +} + #endif /* NDIS_PCI_DEV_TABLE */ ==== //depot/projects/gdb/sys/dev/if_ndis/if_ndisvar.h#7 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/if_ndis/if_ndisvar.h,v 1.14 2004/07/07 17:46:30 wpaul Exp $ + * $FreeBSD: src/sys/dev/if_ndis/if_ndisvar.h,v 1.15 2004/07/11 00:19:30 wpaul Exp $ */ #define NDIS_DEFAULT_NODENAME "FreeBSD NDIS node" @@ -90,7 +90,9 @@ struct resource *ndis_res_altmem; int ndis_altmem_rid; struct resource *ndis_res_am; /* attribute mem (pccard) */ + int ndis_am_rid; struct resource *ndis_res_cm; /* common mem (pccard) */ + struct resource_list ndis_rl; int ndis_rescnt; struct mtx ndis_mtx; struct mtx ndis_intrmtx; ==== //depot/projects/gdb/sys/kern/uipc_socket.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.195 2004/07/10 21:43:35 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.198 2004/07/11 01:44:12 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -63,6 +63,9 @@ #include +static int soreceive_rcvoob(struct socket *so, struct uio *uio, + int flags); + #ifdef INET static int do_setopt_accept_filter(struct socket *so, struct sockopt *sopt); #endif @@ -831,6 +834,64 @@ } /* + * The part of soreceive() that implements reading non-inline out-of-band + * data from a socket. For more complete comments, see soreceive(), from + * which this code originated. + * + * XXXRW: Note that soreceive_rcvoob(), unlike the remainder of soreceve(), + * is unable to return an mbuf chain to the caller. + */ +static int +soreceive_rcvoob(so, uio, flags) + struct socket *so; + struct uio *uio; + int flags; +{ + struct protosw *pr = so->so_proto; + struct mbuf *m; + int error; + + KASSERT(flags & MSG_OOB, ("soreceive_rcvoob: (flags & MSG_OOB) == 0")); + + m = m_get(M_TRYWAIT, MT_DATA); + if (m == NULL) + return (ENOBUFS); + error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK); + if (error) + goto bad; + do { +#ifdef ZERO_COPY_SOCKETS + if (so_zero_copy_receive) { + vm_page_t pg; + int disposable; + + if ((m->m_flags & M_EXT) + && (m->m_ext.ext_type == EXT_DISPOSABLE)) + disposable = 1; + else + disposable = 0; + + pg = PHYS_TO_VM_PAGE(vtophys(mtod(m, caddr_t))); + if (uio->uio_offset == -1) + uio->uio_offset =IDX_TO_OFF(pg->pindex); + + error = uiomoveco(mtod(m, void *), + min(uio->uio_resid, m->m_len), + uio, pg->object, + disposable); + } else +#endif /* ZERO_COPY_SOCKETS */ + error = uiomove(mtod(m, void *), + (int) min(uio->uio_resid, m->m_len), uio); + m = m_free(m); + } while (uio->uio_resid && error == 0 && m); +bad: + if (m != NULL) + m_freem(m); + return (error); +} + +/* * Implement receive operations on a socket. * We depend on the way that records are added to the sockbuf * by sbappend*. In particular, each record (mbufs linked through m_next) @@ -864,51 +925,15 @@ mp = mp0; if (psa != NULL) - *psa = 0; + *psa = NULL; if (controlp != NULL) - *controlp = 0; + *controlp = NULL; if (flagsp != NULL) flags = *flagsp &~ MSG_EOR; else flags = 0; - if (flags & MSG_OOB) { - m = m_get(M_TRYWAIT, MT_DATA); - if (m == NULL) - return (ENOBUFS); - error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK); - if (error) - goto bad; - do { -#ifdef ZERO_COPY_SOCKETS - if (so_zero_copy_receive) { - vm_page_t pg; - int disposable; - - if ((m->m_flags & M_EXT) - && (m->m_ext.ext_type == EXT_DISPOSABLE)) - disposable = 1; - else - disposable = 0; - - pg = PHYS_TO_VM_PAGE(vtophys(mtod(m, caddr_t))); - if (uio->uio_offset == -1) - uio->uio_offset =IDX_TO_OFF(pg->pindex); - - error = uiomoveco(mtod(m, void *), - min(uio->uio_resid, m->m_len), - uio, pg->object, - disposable); - } else -#endif /* ZERO_COPY_SOCKETS */ - error = uiomove(mtod(m, void *), - (int) min(uio->uio_resid, m->m_len), uio); - m = m_free(m); - } while (uio->uio_resid && error == 0 && m); -bad: - if (m != NULL) - m_freem(m); - return (error); - } + if (flags & MSG_OOB) + return (soreceive_rcvoob(so, uio, flags)); if (mp != NULL) *mp = NULL; if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) @@ -985,6 +1010,7 @@ SOCKBUF_LOCK_ASSERT(&so->so_rcv); if (uio->uio_td) uio->uio_td->td_proc->p_stats->p_ru.ru_msgrcv++; + KASSERT(m == so->so_rcv.sb_mb, ("soreceive: m != so->so_rcv.sb_mb")); SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv); nextrecord = m->m_nextpkt; ==== //depot/projects/gdb/usr.bin/hexdump/conv.c#2 (text+ko) ==== @@ -35,20 +35,35 @@ static const char sccsid[] = "@(#)conv.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/hexdump/conv.c,v 1.6 2002/09/04 23:29:01 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/hexdump/conv.c,v 1.7 2004/07/11 01:11:12 tjr Exp $"); #include +#include #include #include +#include +#include +#include +#include #include "hexdump.h" void -conv_c(PR *pr, u_char *p) +conv_c(PR *pr, u_char *p, size_t bufsize) { char buf[10]; char const *str; + wchar_t wc; + size_t clen, oclen; + int converr, pad, width; + char peekbuf[MB_LEN_MAX]; + if (pr->mbleft > 0) { + str = "**"; + pr->mbleft--; + goto strpr; + } + switch(*p) { case '\0': str = "\\0"; @@ -78,9 +93,53 @@ default: break; } - if (isprint(*p)) { - *pr->cchar = 'c'; - (void)printf(pr->fmt, *p); + /* + * Multibyte characters are disabled for hexdump(1) for backwards + * compatibility and consistency (none of its other output formats + * recognize them correctly). + */ + converr = 0; + if (odmode && MB_CUR_MAX > 1) { + oclen = 0; +retry: + clen = mbrtowc(&wc, p, bufsize, &pr->mbstate); + if (clen == 0) + clen = 1; + else if (clen == (size_t)-1 || (clen == (size_t)-2 && + buf == peekbuf)) { + memset(&pr->mbstate, 0, sizeof(pr->mbstate)); + wc = *p; + clen = 1; + converr = 1; + } else if (clen == (size_t)-2) { + /* + * Incomplete character; peek ahead and see if we + * can complete it. + */ + oclen = bufsize; + bufsize = peek(p = peekbuf, MB_CUR_MAX); + goto retry; + } + clen += oclen; + } else { + wc = *p; + clen = 1; + } + if (!converr && iswprint(wc)) { + if (!odmode) { + *pr->cchar = 'c'; + (void)printf(pr->fmt, (int)wc); + } else { + *pr->cchar = 'C'; + assert(strcmp(pr->fmt, "%3C") == 0); + width = wcwidth(wc); + assert(width > 0); + pad = 3 - width; + if (pad < 0) + pad = 0; + (void)printf("%*s%C", pad, "", wc); + pr->mbleft = clen - 1; + } } else { (void)sprintf(buf, "%03o", (int)*p); str = buf; ==== //depot/projects/gdb/usr.bin/hexdump/display.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/hexdump/display.c,v 1.18 2002/09/04 23:29:01 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/hexdump/display.c,v 1.19 2004/07/11 01:11:12 tjr Exp $"); #include #include @@ -132,7 +132,8 @@ (void)printf(pr->fmt, ""); break; case F_C: - conv_c(pr, bp); + conv_c(pr, bp, eaddress ? eaddress - address : + blocksize - address % blocksize); break; case F_CHAR: (void)printf(pr->fmt, *bp); @@ -261,6 +262,10 @@ errx(1, "cannot skip past end of input"); if (need == blocksize) return((u_char *)NULL); + /* + * XXX bcmp() is not quite right in the presence + * of multibyte characters. + */ if (vflag != ALL && valid_save && bcmp(curp, savp, nread) == 0) { @@ -284,6 +289,10 @@ if (length != -1) length -= n; if (!(need -= n)) { + /* + * XXX bcmp() is not quite right in the presence + * of multibyte characters. + */ if (vflag == ALL || vflag == FIRST || valid_save == 0 || bcmp(curp, savp, blocksize) != 0) { @@ -303,6 +312,27 @@ } } +size_t +peek(u_char *buf, size_t nbytes) +{ + size_t n, nread; + int c; + + if (length != -1 && nbytes > length) + nbytes = length; + nread = 0; + while (nread < nbytes && (c = getchar()) != EOF) { + *buf++ = c; + nread++; + } + n = nread; + while (n-- > 0) { + c = *--buf; + ungetc(c, stdin); + } + return (nread); +} + int next(char **argv) { ==== //depot/projects/gdb/usr.bin/hexdump/hexdump.h#2 (text+ko) ==== @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)hexdump.h 8.1 (Berkeley) 6/6/93 - * $FreeBSD: src/usr.bin/hexdump/hexdump.h,v 1.8 2002/09/04 23:29:01 dwmalone Exp $ + * $FreeBSD: src/usr.bin/hexdump/hexdump.h,v 1.9 2004/07/11 01:11:12 tjr Exp $ */ +#include + typedef struct _pr { struct _pr *nextpr; /* next print unit */ #define F_ADDRESS 0x001 /* print offset */ @@ -52,6 +54,8 @@ char *cchar; /* conversion character */ char *fmt; /* printf format */ char *nospace; /* no whitespace version */ + int mbleft; /* bytes left of multibyte char. */ + mbstate_t mbstate; /* conversion state */ } PR; typedef struct _fu { @@ -88,7 +92,7 @@ void badfmt(const char *); void badsfmt(void); void bpad(PR *); -void conv_c(PR *, u_char *); +void conv_c(PR *, u_char *, size_t); void conv_u(PR *, u_char *); void display(void); void doskip(const char *, int); @@ -98,6 +102,7 @@ int next(char **); void nomem(void); void oldsyntax(int, char ***); +size_t peek(u_char *, size_t); void rewrite(FS *); int size(FS *); void usage(void); ==== //depot/projects/gdb/usr.bin/hexdump/od.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)od.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/hexdump/od.1,v 1.16 2004/07/03 01:28:20 tjr Exp $ +.\" $FreeBSD: src/usr.bin/hexdump/od.1,v 1.17 2004/07/11 01:11:12 tjr Exp $ .\" -.Dd July 3, 2004 +.Dd July 11, 2004 .Os .Dt OD 1 .Sh NAME @@ -179,6 +179,10 @@ .It vertical tab \ev .El +.Pp +Multi-byte characters are displayed in the area corresponding to the first +byte of the character. The remaining bytes are shown as +.Ql ** . .It Xo .Sm off .Op Cm d | o | u | x @@ -231,6 +235,15 @@ If no output format is specified, .Fl t Ar oS is assumed. +.Sh ENVIRONMENT +The +.Ev LANG , LC_ALL +and +.Ev LC_CTYPE +environment variables affect the execution of +.Nm +as described in +.Xr environ 7 . .Sh DIAGNOSTICS .Ex -std .Sh COMPATIBILITY @@ -252,7 +265,3 @@ .Nm command appeared in .At v1 . -.Sh BUGS -The -.Nm -utility does not recognize multibyte characters. From owner-p4-projects@FreeBSD.ORG Sun Jul 11 03:03:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 889CF16A4ED; Sun, 11 Jul 2004 03:03:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 317EE16A4DA for ; Sun, 11 Jul 2004 03:03:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 162E443D45 for ; Sun, 11 Jul 2004 03:03:51 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B33oVi054111 for ; Sun, 11 Jul 2004 03:03:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B33oH5054108 for perforce@freebsd.org; Sun, 11 Jul 2004 03:03:50 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 03:03:50 GMT Message-Id: <200407110303.i6B33oH5054108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 03:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=57029 Change 57029 by davidxu@davidxu_alona on 2004/07/11 03:03:32 use macro DBG_CAN_RUN to test TMDF_DONOTRUNUSER. fix a searching bug in pq_first_debug(). Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#6 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_priority_queue.c#4 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#6 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#6 (text+ko) ==== @@ -992,7 +992,7 @@ */ if (curthread == NULL) ; /* Nothing to do here. */ - else if ((curthread->need_switchout == 0) && + else if ((curthread->need_switchout == 0) && DBG_CAN_RUN(curthread) && (curthread->blocked == 0) && (THR_IN_CRITICAL(curthread))) { /* * Resume the thread and tell it to yield when @@ -2542,6 +2542,6 @@ * suspension event. */ if ((curthread->attr.flags & PTHREAD_SCOPE_SYSTEM) == 0 && - (curthread->tcb->tcb_tmbx.tm_dflags & TMDF_DONOTRUNUSER)) + !DBG_CAN_RUN(curthread)) _thr_sched_switch(curthread); } ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_priority_queue.c#4 (text+ko) ==== @@ -250,7 +250,7 @@ pthread_t _pq_first_debug(pq_queue_t *pq) { - pq_list_t *pql; + pq_list_t *pql, *pqlnext = NULL; pthread_t pthread = NULL; /* @@ -259,13 +259,14 @@ PQ_ASSERT_INACTIVE(pq, "_pq_first: pq_active"); PQ_SET_ACTIVE(pq); - while (((pql = TAILQ_FIRST(&pq->pq_queue)) != NULL) && - (pthread == NULL)) { + for (pql = TAILQ_FIRST(&pq->pq_queue); + pql != NULL && pthread == NULL; pql = pqlnext) { if ((pthread = TAILQ_FIRST(&pql->pl_head)) == NULL) { /* * The priority list is empty; remove the list * from the queue. */ + pqlnext = TAILQ_NEXT(pql, pl_link); TAILQ_REMOVE(&pq->pq_queue, pql, pl_link); /* Mark the list as not being in the queue: */ @@ -276,16 +277,16 @@ * test, If TMDF_DONOTRUNUSER is set after we tested it, * we will run the thread, this seems be a problem, * fortunatly, when we are being debugged, all context - * switch will be done by kse_switchin, that is a syscall, - * kse_switchin will check the flag again, the thread - * will be returned via upcall, so next time, UTS won't - * run the thread. + * switch will be done by kse_switchin, that is a + * syscall, kse_switchin will check the flag again, + * the thread will be returned via upcall, so next + * time, UTS won't run the thread. */ - while (pthread != NULL && !THR_IN_CRITICAL(pthread) && - (pthread->tcb->tcb_tmbx.tm_dflags & - TMDF_DONOTRUNUSER)) { + while (pthread != NULL && !DBG_CAN_RUN(pthread)) { pthread = TAILQ_NEXT(pthread, pqe); } + if (pthread == NULL) + pqlnext = TAILQ_NEXT(pql, pl_link); } } ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#6 (text+ko) ==== @@ -968,6 +968,8 @@ (((thrd)->state == PS_SUSPENDED) || \ (((thrd)->flags & THR_FLAGS_SUSPENDED) != 0)) #define THR_IS_EXITING(thrd) (((thrd)->flags & THR_FLAGS_EXITING) != 0) +#define DBG_CAN_RUN(thrd) (((thrd)->tcb->tcb_tmbx.tm_dflags & \ + TMDF_DONOTRUNUSER) == 0) extern int __isthreaded; From owner-p4-projects@FreeBSD.ORG Sun Jul 11 03:38:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7469C16A4D0; Sun, 11 Jul 2004 03:38:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38CB616A4CE for ; Sun, 11 Jul 2004 03:38:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EE5D43D3F for ; Sun, 11 Jul 2004 03:38:39 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B3cdt2055343 for ; Sun, 11 Jul 2004 03:38:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B3cc2Q055340 for perforce@freebsd.org; Sun, 11 Jul 2004 03:38:38 GMT (envelope-from marcel@freebsd.org) Date: Sun, 11 Jul 2004 03:38:38 GMT Message-Id: <200407110338.i6B3cc2Q055340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 03:38:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=57036 Change 57036 by marcel@marcel_nfs on 2004/07/11 03:38:16 IFC @57035 Affected files ... .. //depot/projects/gdb/bin/csh/config.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/FAQ#2 integrate .. //depot/projects/gdb/contrib/tcsh/FREEBSD-Xlist#2 integrate .. //depot/projects/gdb/contrib/tcsh/Fixes#2 integrate .. //depot/projects/gdb/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/gdb/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/tcsh/README#2 integrate .. //depot/projects/gdb/contrib/tcsh/WishList#2 integrate .. //depot/projects/gdb/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/gdb/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/gdb/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/configure#2 integrate .. //depot/projects/gdb/contrib/tcsh/configure.in#2 integrate .. //depot/projects/gdb/contrib/tcsh/csh-mode.el#2 integrate .. //depot/projects/gdb/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/glob.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/glob.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/host.defs#2 integrate .. //depot/projects/gdb/contrib/tcsh/ma.setp.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/C/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/Makefile#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/et/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/finnish/set14#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/finnish/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/french/set11#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/french/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/german/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/greek/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/italian/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/ja/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/spanish/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/gdb/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.set.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/gdb/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/gdb/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/gdb/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/gdb/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/gdb/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/gdb/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/gdb/sys/ia64/conf/SKI#3 integrate .. //depot/projects/gdb/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/gdb/sys/sparc64/conf/NOTES#5 integrate Differences ... ==== //depot/projects/gdb/bin/csh/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* config.h. Generated automatically by configure. */ +/* config.h. Generated by configure. */ /* * config.h -- configure various defines for tcsh * @@ -7,7 +7,7 @@ * Edit this to match your system type. */ -/* $FreeBSD: src/bin/csh/config.h,v 1.7 2001/09/05 22:56:58 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.8 2004/07/11 02:23:38 mp Exp $ */ #ifndef _h_config #define _h_config @@ -29,14 +29,14 @@ /* #undef POSIXSIGS */ /* - * VFORK This machine has a vfork(). + * VFORK This machine has a vfork(). * It used to be that for job control to work, this define * was mandatory. This is not the case any more. - * If you think you still need it, but you don't have vfork, - * define this anyway and then do #define vfork fork. + * If you think you still need it, but you don't have vfork, + * define this anyway and then do #define vfork fork. * I do this anyway on a Sun because of yellow pages brain damage, * [should not be needed under 4.1] - * and on the iris4d cause SGI's fork is sufficiently "virtual" + * and on the iris4d cause SGI's fork is sufficiently "virtual" * that vfork isn't necessary. (Besides, SGI's vfork is weird). * Note that some machines eg. rs6000 have a vfork, but not * with the berkeley semantics, so we cannot use it there either. @@ -101,7 +101,7 @@ * SIGVOID Define this if your signal handlers return void. On older * systems, signal returns int, but on newer ones, it returns void. */ -#define SIGVOID +#define SIGVOID /* * HAVEDUP2 Define this if your system supports dup2(). @@ -132,11 +132,19 @@ #define BSD_STYLE_COLORLS #endif +#if defined(__NetBSD__) +#include +#if __NetBSD_Version__ >= 106030000 /* NetBSD 1.6C */ +#define HAVEUTMPX +#endif +#endif + #if defined(__bsdi__) /* * _PATH_TCSHELL if you've change the installation location (vix) */ -# if _BSDI_VERSION >= 199701 +#include +# ifdef _BSDI_VERSION >= 199701 # define _PATH_TCSHELL "/bin/tcsh" /* # undef SYSMALLOC */ # define SYSMALLOC @@ -144,8 +152,8 @@ # define _PATH_TCSHELL "/usr/contrib/bin/tcsh" # endif -# undef NLS -# undef NLS_CATALOGS +/* # undef NLS */ +/* # undef NLS_CATALOGS */ #elif defined(__APPLE__) # define SYSMALLOC @@ -154,8 +162,5 @@ # define NLS_CATALOGS #endif -#define KANJI -#define DSPMBYTE - #endif /* _h_config */ /* config.h.in. Generated automatically from configure.in by autoheader. */ ==== //depot/projects/gdb/contrib/tcsh/FAQ#2 (text+ko) ==== @@ -11,7 +11,12 @@ be able to get ftp it... :-) _________________________________________________________________ - 1. Why is the meta key broken in tcsh-5.20 and up? + 1. Where can I find tcsh sources? + + See http://www.tcsh.org/MostRecentRelease for download locations. + _________________________________________________________________ + + 2. Why is the meta key broken in tcsh-5.20 and up? On some machines the tty is not set up to pass 8 bit characters by default. Tcsh 5.19 used to try to determine if pass8 should be set by @@ -40,7 +45,7 @@ printable meta characters for commands) setenv NOREBIND. _________________________________________________________________ - 2. I ran 'dbxtool &' and 'shelltool &' from tcsh, and they end up in + 3. I ran 'dbxtool &' and 'shelltool &' from tcsh, and they end up in cbreak and no echo mode? These programs are broken. Background jobs should not try to look at @@ -56,19 +61,19 @@ in your .dbxinit _________________________________________________________________ - 3. I tried to compile tcsh and it cannot find ? + 4. I tried to compile tcsh and it cannot find ? Your system does not support NLS. Undefine NLS in config_f.h and it should work fine. _________________________________________________________________ - 4. Where can I get csh sources? + 5. Where can I get csh sources? Csh sources are now available with the 4.4BSD networking distributions. You don't need csh sources to compile tcsh-6.0x. _________________________________________________________________ - 5. I just made tcsh my login shell, and I cannot ftp any more? + 6. I just made tcsh my login shell, and I cannot ftp any more? Newer versions of the ftp daemon check for the validity of the user's shell before they allow logins. The list of valid login shells is @@ -81,7 +86,7 @@ shells for your system, so that other people can ftp too :-) _________________________________________________________________ - 6. I am using SunView? or OpenWindows? and editing is screwed up. In + 7. I am using SunView or OpenWindows and editing is screwed up. In particular my arrow keys and backspace don't work right. What am I doing wrong? @@ -93,32 +98,36 @@ 1. Don't use suntools 2. Use shelltool instead of cmdtool. 3. Unset edit in tcsh. + _________________________________________________________________ - 6b. On a SPARCstation running Solaris 2.x and OpenWindows? 3.1, inside - a cmdtool, the short-cut key sequence to clear log (i.e. Meta-e or - Diamond-e) doesn't work: it just echos 'e' + 8. On a SPARCstation running Solaris 2.x and OpenWindows 3.1, inside a + cmdtool, the short-cut key sequence to clear log (i.e. Meta-e or + Diamond-e) doesn't work: it just echos 'e'; or + + Unset edit in tcsh. + _________________________________________________________________ - 6c. On a SPARCstation running Solaris 2.x and OpenWindows? 3.1, - maketool (within SPARCworks) doesn't work: it just does a `cd' to the - working directory then stops. + 9. On a SPARCstation running Solaris 2.x and OpenWindows 3.1, maketool + (within SPARCworks) doesn't work: it just does a `cd' to the working + directory then stops. - The workaround for 6b and 6c is doing "unset edit." Using shelltool - instead of cmdtool doesn't fix 6c. + Unset edit in tcsh. Using shelltool instead of cmdtool does not fix + this. _________________________________________________________________ - 7. I rlogin to another machine, and then no matter what I tell 'stty' + 10. I rlogin to another machine, and then no matter what I tell 'stty' I cannot get it to pass 8 bit characters? Maybe you need to use 'rlogin -8' to tell rlogin to pass 8 bit characters. _________________________________________________________________ - 8. Where do I get the public domain directory library? + 11. Where do I get the public domain directory library? Anonymous ftp to prep.ai.mit.edu:/pub/gnu/dirent.tar.Z _________________________________________________________________ - 9. I compiled tcsh using gcc, and when I start up it says: tcsh: + 12. I compiled tcsh using gcc, and when I start up it says: tcsh: Warning no access to tty (Invalid Argument). Thus no job control in this shell @@ -130,13 +139,13 @@ 3. Compile with cc. _________________________________________________________________ - 10. I compiled tcsh with the SunOS? unbundled compiler and now things + 13. I compiled tcsh with the SunOS unbundled compiler and now things get echo'ed twice. It is a bug in the unbundled optimizer. Lower the optimization level. _________________________________________________________________ - 11. How can I use the arrow keys with hpterm? + 14. How can I use the arrow keys with hpterm? Hp terminals use the arrow keys internally. You can tell hpterm not to do that, by sending it the termcap sequence smkx. Since this has to be @@ -151,7 +160,7 @@ if you are using termcap, replace "smkx" with "ks"... _________________________________________________________________ - 12. On POSIX machines ^C and ^Z will do not work when tcsh is a login + 15. On POSIX machines ^C and ^Z will do not work when tcsh is a login shell? Make sure that the interrupt character is set to ^C and suspend is set @@ -159,7 +168,7 @@ ^C susp ^Z' will set them to ^C and ^Z respectively. _________________________________________________________________ - 13. I am trying to compile tcsh and I am getting compile errors that + 16. I am trying to compile tcsh and I am getting compile errors that look like: >sh.c:???: `STR???' undeclared, outside of functions [gcc] @@ -169,7 +178,7 @@ headers. Type 'make clean; make' _________________________________________________________________ - 14. On the cray, sometimes the CR/LF mapping gets screwed up. + 17. On the cray, sometimes the CR/LF mapping gets screwed up. You are probably logged in to the cray via telnet. Cray's telnetd implements line mode selection the telnet client you are using does @@ -181,21 +190,21 @@ character'. _________________________________________________________________ - 15. On AU/X, I made tcsh my startup shell, but the mac desktop is not + 18. On AU/X, I made tcsh my startup shell, but the mac desktop is not starting up (no X11 or Finder), and I only get console emulation. This is another manifestation of item 5. Just add the pathname to tcsh in /etc/shells and everything should work fine. _________________________________________________________________ - 16. On machines that use YP (NIS) tilde expansion might end up in + 19. On machines that use YP (NIS) tilde expansion might end up in /dev/null If this happens complain to your vendor, to get a new version of NIS. You can fix that in tcsh by defining YPBUGS in config.h _________________________________________________________________ - 17. Script on SGI 4.0.5 does not give us a tty, so we cannot have job + 20. Script on SGI 4.0.5 does not give us a tty, so we cannot have job control. Their csh does not have job control either. Try: @@ -204,18 +213,21 @@ % cat > /dev/tty _________________________________________________________________ - 18. I start tcsh and it takes a couple of minutes to get the prompt. + 21. I start tcsh and it takes a couple of minutes to get the prompt. You have defined REMOTEHOST and your DNS is not responding. Either undefine REMOTEHOST and recompile or fix your DNS. _________________________________________________________________ - 19. If you need help generating your .cshrc file, check out: + 22. If you need help generating your .cshrc file, check out: + + http://www.imada.sdu.dk/~blackie/dotfile/ - http://www.imada.ou.dk/~blackie/dotfile/ + or + http://www.dotfiles.com _________________________________________________________________ - 20. On POSIX systems the kernel will send hup signals to all the + 23. On POSIX systems the kernel will send hup signals to all the processes in the foreground process group if 'stty hupcl' is set. For example @@ -230,27 +242,57 @@ avoid that you can set stty -hupcl, but it is not recommended. _________________________________________________________________ - 21. When I rsh the meta key stops working on the remote machine. + 24. When I rsh the meta key stops working on the remote machine. Try using rsh -8; this option is undocumented on some systems, but it works. If that does not work, get and use ssh/sshd. You'll be better off from a security point of view anyway. _________________________________________________________________ - 22. Tcsh compiled under hp/ux-10.x does not pass resource limits + 25. Tcsh compiled under hp/ux-10.x does not pass resource limits correctly when ran on hp/ux-11.x systems. This is a problem with lack of ABI compatibility between the two systems. The only solution is to recompile. _________________________________________________________________ - 23. Refreshing in command line editing can appear broken on some OS's + 26. Refreshing in command line editing can appear broken on some OS's This is because the termcap/terminfo description lies about the ability of the terminal to use tabs. At least on Compaq/DEC Alpha OSF/1 3.x and 4.x systems, stty -tabs will cause problems. _________________________________________________________________ + 27. Where can I learn the merits of tcsh vs. bash vs. csh vs. sh etc? + + You can read the manual page section titled [NEW FEATURES] listing + features that tcsh adds to csh. + + You can read Tom Christiansen's [Csh Programming Considered Harmful], + a document advocating that csh (and by extension, tcsh) should not be + used for writing shell scripts. + + XXX: Need to find something about [bash], but bash is sh-compatible + and has many of the same interactive features of tcsh (command + completion does not appear to be as flexible, though). + + [Curtains up: introducing the Z shell] has a pretty good rundown on + zsh. Aside from the arguments about csh being evil, tcsh appears to + compare well with zsh [zsh]. Zsh is sh and ksh compatible, with many + of the interactive features of tcsh. + _________________________________________________________________ + + 28. Why does FreeBSD's tcsh do history browsing differently than I + expect? + + On FreeBSD, by default, the up arrow is set to + "history-search-backward", rather than the default "up-history". As a + result, if you type (part of) a word and press up arrow, you'll see + previous commands that match the prefix. Pretty useful, actually, + although it takes some getting used to. You can use bindkey to see + your settings, and to rebind up & down differently if desired. + _________________________________________________________________ + Everything else is a bug :-( Christos @@ -258,5 +300,5 @@ Home | RecentChanges | Preferences Edit text of this page | View other revisions - Last edited April 27, 2001 13:43 (diff) + Last edited April 29, 2004 15:02 (diff) Search: ____________________ ==== //depot/projects/gdb/contrib/tcsh/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,8 +1,9 @@ -$FreeBSD: src/contrib/tcsh/FREEBSD-Xlist,v 1.1 2002/07/24 16:42:58 mp Exp $ +$FreeBSD: src/contrib/tcsh/FREEBSD-Xlist,v 1.2 2004/07/11 02:20:52 mp Exp $ */BUGS */config/a* */config/bs2000 */config/bsd */config/bsdreno */config/[c-z]* +*/nls/*/charset */win32 ==== //depot/projects/gdb/contrib/tcsh/Fixes#2 (text+ko) ==== @@ -1,3 +1,46 @@ + 36. V6.13.00 - 20040519 + 35. V6.12.03 - 20040322 + 34. turn on kanji and dspmbyte by default; add check for utf8 locales, + and turn parsing of that automatically based on $LANG. + 33. Fix compilation issue under Windows/NT and charset incorrect patch + (Yoshiyuki Sakakibara) + 32. completion additions (Tom Warzeka) + 31. compilation fix (Martin Kraemer) + 30. V6.12.02 - 20040221 + 29. Glob completion listing addition (Tom Warzeka) + 28. BS2000 bs2cmd builtin. (Martin Kraemer) + 27. Fix interrupt resetting code when /etc startup scripts have syntax errors + (Mark A. Grondona) + 26. Clarification of kill-ring commands (Per Hedeland) + 25. Debian completion additions (Martin Godisch) + 24. Japanese character set fixes (Juehiro-san) from debian + 23. NLS charset fixes; disabled since they only work with gnu gencat + (Martin Godisch) + 22. Fix HPUX >= 11 resource (Jack Cummings) + 21. Handle breaksw that jumps out of loops. + 20. Revert #16. It causes worse problems. + 19. Avoid using execl() because the last NULL does not always promoted to + a pointer because the function is variadic (Harti Brandt) + 18. revert ignoreeof to the 6.11.00 behavior and document it (Martin Godisch) + 17. do a case insensitive comparison for the multibyte vars (Martin Godisch) + 16. don't sigsuspend() for an already exited job + 15. glob all arguments in source (Martin Godisch) + 14. various debian fixes (Martin Godisch) + 13. setenv syntax check revert (Satoshi I. Nozawa) + 12. EAGAIN typo (dan harkless) + 11. filec compilation issue on hpux (beebe) + 10. win32 compilation fixes for O_LARGEFILE (amol) + 9. Don't go into an infinite loop when tcgetpgrp() returns an error. + 8. Cygwin fixes (Corinna Vinschen) + 7. NLS catclose() bug avoidance (KAJIMOTO Masato) + 6. V6.12.01 - 20030208 + 5. Misc NT cleanup. No more GPL code (amol) + 4. use strtol() to detect errors in builtin kill (Peter Jeremy) + 3. Recognize linux systems on mips* (Maciej W. Rozycki) + 2. Enable complete=igncase on unix (Stephen Krauth) + 1. Eliminate maxitems (Todd Miller) + + 58. V6.12.00 - 20020732 57. misc cleanups. 56. V6.11.05 - 20020712 55. We should have socklen_t in the INET6 case, but we leave int otherwise. ==== //depot/projects/gdb/contrib/tcsh/Imakefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ XCOMM -XCOMM $Id: Imakefile,v 1.81 2002/07/23 16:18:31 christos Exp $ +XCOMM $Id: Imakefile,v 1.83 2003/02/08 20:03:25 christos Exp $ XCOMM XCOMM Imakefile for tcsh 6.12 XCOMM Marc Horowitz, MIT SIPB @@ -482,16 +482,18 @@ SUF = o VERSION = 6.12 -SHSRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ - sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ - sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ - sh.set.c sh.time.c sh.char.h sh.dir.h sh.proc.h sh.h \ - sh.decls.h glob.c glob.h ${SYSSRCS} +SHSRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c \ + sh.char.c sh.exp.c sh.file.c sh.func.c \ + sh.glob.c sh.hist.c sh.init.c sh.lex.c \ + sh.misc.c sh.parse.c sh.print.c sh.proc.c \ + sh.sem.c sh.set.c sh.time.c glob.c \ + sh.char.h sh.dir.h sh.proc.h sh.h \ + sh.decls.h glob.h ${SYSSRCS} SHOBJS= sh.${SUF} sh.dir.${SUF} sh.dol.${SUF} sh.err.${SUF} sh.exec.${SUF} \ - sh.char.${SUF} sh.exp.${SUF} sh.func.${SUF} sh.glob.${SUF} \ - sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} sh.misc.${SUF} \ - sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} sh.sem.${SUF} \ - sh.set.${SUF} sh.time.${SUF} glob.${SUF} ${SYSOBJS} + sh.char.${SUF} sh.exp.${SUF} sh.file.${SUF} sh.func.${SUF} \ + sh.glob.${SUF} sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} \ + sh.misc.${SUF} sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} \ + sh.sem.${SUF} sh.set.${SUF} sh.time.${SUF} glob.${SUF} ${SYSOBJS} TWSRCS= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \ tw.comp.c tw.color.c ==== //depot/projects/gdb/contrib/tcsh/Makefile.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 3.19 2002/07/23 16:13:21 christos Exp $ +# $Id: Makefile.in,v 3.20 2003/03/12 19:14:50 christos Exp $ # Makefile.in 4.3 6/11/83 # # C Shell with process control; VM/UNIX VAX Makefile @@ -9,7 +9,7 @@ # SHELL=/bin/sh VERSION=6.12 -BUILD=tcsh +BUILD=tcsh$(EXEEXT) VPATH=@srcdir@ srcdir=@srcdir@ @@ -136,7 +136,7 @@ #DFLAGS= #DFLAGS=-D_PATH_TCSHELL='"${DESTBIN}/tcsh"' ## The following is set by autoconf. -DFLAGS = -D_PATH_TCSHELL='"${DESTBIN}/tcsh"' @DFLAGS@ @CPPFLAGS@ +DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcsh"' @DFLAGS@ @CPPFLAGS@ ################################################################ @@ -284,6 +284,7 @@ # DESTMAN=${DESTDIR}/catman/man${MANSECT} # A/UX # DESTMAN=${DESTDIR}/usr/share/man/man${MANSECT} # Stardent Vistra (SysVR4) # DESTMAN=/usr/catman/1l # Amiga unix (SysVR4) +EXEEXT=@EXEEXT@ FTPAREA=/usr/spool/ftp ASSRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ @@ -340,9 +341,9 @@ all: ${BUILD} -tcsh:$(P) ${OBJS} - rm -f tcsh core - ${CC} -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS} +tcsh$(EXEEXT):$(P) ${OBJS} + rm -f tcsh$(EXEEXT) core + ${CC} -o tcsh$(EXEEXT) ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS} tcsh.sbin:$(P) ${OBJS} rm -f tcsh.sbin core @@ -350,11 +351,11 @@ # Purify pure:$(P) ${OBJS} - rm -f tcsh core - purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS} + rm -f tcsh$(EXEEXT) core + purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh$(EXEEXT) ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS} # OS/2 -tcsh.exe: tcsh - emxbind tcsh +#tcsh.exe: tcsh +# emxbind tcsh gethost: gethost.c sh.err.h tc.const.h sh.h rm -f gethost @@ -474,12 +475,12 @@ install-strip: install -install: tcsh +install: tcsh$(EXEEXT) -mkdir -p ${DESTBIN} - -mv -f ${DESTBIN}/tcsh ${DESTBIN}/tcsh.old - cp tcsh ${DESTBIN}/tcsh - -strip ${DESTBIN}/tcsh - chmod 555 ${DESTBIN}/tcsh + -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old + cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) + -strip ${DESTBIN}/tcsh$(EXEEXT) + chmod 755 ${DESTBIN}/tcsh$(EXEEXT) install.man: tcsh.man -mkdir -p ${DESTMAN} @@ -487,6 +488,19 @@ cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT} chmod 444 ${DESTMAN}/tcsh.${MANSECT} +install.cygwin: install install.man + -mkdir -p ${DESTDIR}${prefix}/doc/tcsh + cp ${srcdir}/FAQ ${srcdir}/Fixes ${DESTDIR}${prefix}/doc/tcsh + cp ${srcdir}/NewThings ${srcdir}/README ${DESTDIR}${prefix}/doc/tcsh + cp ${srcdir}/WishList ${srcdir}/Y2K ${DESTDIR}${prefix}/doc/tcsh + perl ${srcdir}/tcsh.man2html ${srcdir}/tcsh.man + cp -rp tcsh.html ${DESTDIR}${prefix}/doc/tcsh + -mkdir -p ${DESTDIR}/etc/profile.d + -mkdir -p ${DESTDIR}/etc/postinstall + cp -p ${srcdir}/cygwin/etc/csh.* ${DESTDIR}/etc + cp -p ${srcdir}/cygwin/etc/profile.d/*.tcsh ${DESTDIR}/etc/profile.d + cp -p ${srcdir}/cygwin/etc/postinstall/tcsh.sh ${DESTDIR}/etc/postinstall + # Amiga Unix #install.man: tcsh.man # compress tcsh.man @@ -500,7 +514,7 @@ # chmod 444 ${DESTMAN}/tcsh.${MANSECT}.Z clean: - ${RM} -f a.out strings x.c xs.c tcsh tcsh.a _MAKE_LOG core gethost + ${RM} -f a.out strings x.c xs.c tcsh$(EXEEXT) tcsh.a _MAKE_LOG core gethost ${RM} -f *.${SUF} sh.prof.c ed.defns.h tc.const.h sh.err.h tc.defs.c ${RM} -f tcsh.*.m tcsh.*.cat ==== //depot/projects/gdb/contrib/tcsh/README#2 (text+ko) ==== @@ -96,8 +96,8 @@ 12) PLEASE send any bug reports (and fixes), code for new features, comments, questions, etc. (even flames) to: - The tcsh mailing list - tcsh@mx.gw.com + The tcsh bugs mailing list + tcsh-bugs@mx.gw.com Various: ==== //depot/projects/gdb/contrib/tcsh/WishList#2 (text+ko) ==== @@ -4,15 +4,128 @@ Home | RecentChanges | Preferences _________________________________________________________________ + Surprised by this behavior...is this a bug? + + (Goal: e.g. distinguish between completely numeric args/names and + those containing non-numerics) + + % touch 1023 pex103 pex103a 104a z101 16a02 1999 2001 2001_A_Space_Odyssey + % ls -1 *[^0-9]* + 104a + 16a02 + 2001_A_Space_Odyssey + pex103 + pex103a + z101 + # (great, looks good to me. Got everything containing a nonnumeric, no more, n +o less.) + + % foreach p ( 1023 pex103 pex103a 104a z101 16a02 1999 2001 2001_A_Space_Odyss +ey ) + foreach? if ( $p !~ *[^0-9]* ) echo $p + foreach? end + # (no output. Huh?) + + % foreach p ( 1023 pex103 pex103a 104a z101 16a02 1999 2001 2001_A_Space_Odyss +ey ) + foreach? if ( $p =~ *[^0-9]* ) echo $p + foreach? end + 1023 (!) + pex103 + pex103a + 104a + z101 + 16a02 + 1999 (!) + 2001 (!) + 2001_A_Space_Odyssey + # (Huh?) + + The [MAN page description] for =~ and !~ just refer to "(see [Filename + substitution])', but evidently there is a (unexplained) difference. + The actual filename globbing looks correct to me, but the pattern + matching operator behavior is unexpected, if I'm not missing + something. + + tcsh 6.09.00 + + - bhooglan + _________________________________________________________________ + + I'm a long-time faithful user of tcsh, and one thing has always bugged + me -- the need to type "rehash" at a prompt when adding a new command. + My suggestions is to change tcsh so before printing "Command not + found.", it first searches its entire path and rebuilds its hash + table. Only after doing this, and if the command is still not in the + path, then print "Command not found.". I realize there are some + extreme cases in which this is suboptimal, but in most cases with + normal users this would be a big win, and simplify the manual and + perhaps even the code. + _________________________________________________________________ + + Wish "tcsh -l" would accept other flags. At least "-c". + + Currently I can't get ssh to have the right environment unless it is a + login shell. The .ssh/environment doesn't work for me because I login + to different machines with different environments. One thing to do + would be to not have the different environment for login compared to + other shells, but what I would really like is something like... + + ssh remote_application_server "tcsh -l -c application" + + The "ssh -t" doesn't work for me and I don't know why. + + Thanks Tim + + Fix limit vmemoryuse in Linux + + In Linux tcsh is unable to limit vmemoryuse. This is because + RLIMIT_VMEM isn't defined, instead Linux has RLIMIT_AS which means the + same. On Google groups I found patches suggested by Komazaki at + http://groups.google.com/groups?hl=sv&lr=&ie=UTF-8&oe=ISO-2022-JP&selm + =m3snmczvfc.wl%40thinkpad.osk.3web.ne.jp.osk.3web.ne.jp and Ogawa + Hirofumi suggests a patch at + http://groups.google.com/groups?hl=sv&lr=&ie=UTF-8&selm=87snmba4id.fsf + %40devron.myhome.or.jp None of these patches seems to have been + included in version 6.12 as 6.12 still has this problem. + + /Henrik?? + + New idea: use last line (or n'th line) of output as input to new + command. + + I often find myself typing something like: + + >locate lshort + /usr/local/stow/share/texmf/doc/latex/general/lshort.dvi . . . + /usr/local/store/share/texmf/doc/latex/general/lshort.dvi + + >xdvi /usr/local/store/share/texmf/doc/latex/general/lshort.dvi + + Now the way I accomplish writing the last line, is by moving the mouse + over the last line, and the copy paste it. It would be very nice, if + the shell could keep the last n lines of output in a buffer. This way + one could avoid using the mouse by typing something like: + + >xdvi + + which would insert the last line of output, similarly could + insert the second last line of output. (the exact commands used is of + course configured via bindkey). + + This could save me a couple of times to the mouse everyday - + di010070@diku.dk + + The shell does not capture any output from commands it runs, so + this is really more a feature for the terminal (be it hardware + or software). --Kim + Fix memory leak related to aliasrun(). Precmd, Cwdcmd etc. leak memory. - _________________________________________________________________ Fix migrate -site $$... Seems to hang... (aix370) - _________________________________________________________________ Fix history in loops. - _________________________________________________________________ New idea: sed operations on variables. @@ -21,45 +134,187 @@ variable editing to understand string operations. So I would like to be able to use: - > set a="this is a STRING" - > echo $a:[3-] - is is a STRING - > echo $a:[#] - 16 - > echo $a:[6-7] - is - > echo $a:[-2] - ng - > echo $a:[-20] - Subscript out of bounds. - > echo $a:[2-20] - Subscript out of bounds. - > echo $a:[1-1]:u$a:[2-]. - This is a string. - _________________________________________________________________ +> set a="this is a STRING" +> echo $a:[3-] +is is a STRING +> echo $a:[#] +16 +> echo $a:[6-7] +is +> echo $a:[-2] +ng +> echo $a:[-20] +Subscript out of bounds. +> echo $a:[2-20] +Subscript out of bounds. +> echo $a:[1-1]:u$a:[2-]. +This is a string. + + Fix pipelines that contain builtins so that they behave correctly. I tried to fix that (most of the code is in sh.sem.c, but it works only for non POSIX machines cause otherwise the setpgid() I added fails). - _________________________________________________________________ Fix the correct code... How to do that involves A.I.... - _________________________________________________________________ Rewrite the whole thing. It has taken to much beating over the years... - _________________________________________________________________ Add another hook like precmd to be executed after the prompt but before the command. + + Add instructions for using configure in the README file. + + Make manual page references links in the HTML version of the manual. + + It is possible to match the words with ([0-9]) after them. Links could + be using the manual page CGI at http://www.tac.eu.org/cgi-bin/man-cgi + for content. + + Add OpenBSD?? to the Makefile, etc. + + A Csh compatability mode would be nice: I know tcsh is supposed to be + fully csh compatible, but csh scripts containing such constructs as + '$<' , 'if ( -d $file ) cd $file' or any of a great number of other + valid csh commands, will produce syntax errors or the like with tcsh, + which is frustrating when writing/maintaining csh scripts which have + to run on systems with only tcsh and systems with only csh. If such a + thing exists, I couldn't find it after searching the man page for two + hours, and it should be better documented + + Add hooks for command completion Either for a dynamically loaded + library, or a callback to another program that allows another pass to + complete the command. As a trivial example, the module could duplicate + the functionality of aliases. A tcsh_mud.so could define sigh, groan, + cheer, lol, etc to produce output if they weren't actually valid + commands. + + Properly deal with : in filename substitution + + Given something like + + blah.foo:*.foo + + expand it properly to something like + + blah.foo:baz.foo:bob.foo:bar.foo + + It already does this, if you have a file named like that... --Kim + + Directory commands don't handle blanks in filenames. If I have an + environment variable such as: + +% setenv TOMCAT '/c/Program? Files/Apache? Software Foundation/Tomcat? 5.0' +and then do the following, setenv complains that it has too many arguments. +% cd /tmp +% cd "$TOMCAT" +setenv: Too many arguments +% dirs +/c/Program? Files/Apache? Software Foundation/Tomcat? 5.0 /tmp +% pushd "$TOMCAT" +/c/Program? Files/Apache? Software Foundation/Tomcat? 5.0 +setenv: Too many arguments. +% pushd /tmp +/tmp /c/Program? Files/Apache? Software Foundation/Tomcat? 5.0 +% pushd +/c/Program? Files/Apache? Software Foundation/Tomcat? 5.0 /tmp +setenv: Too many arguments. + + Wish tcsh would feature fc (fix command) as in bash !Wish tcsh would + featuer fc (fix command) as in bash ! + + i wish for read-only CVS access to the sources (as i am on the + bleeding egde) + + Functions would be useful! As would being able to redirect stderr (or + other file descriptors) independently of stdout! -- Rohan Talip + + Don't complete commands with non-executable files. For example if I + have a file called README in a directory in the PATH, and I type R TAB + tcsh will complete README as a command. But README does not have the x + bit set, so it's kind of pointless to have that completion. + + --> Setting the shell variable "recognize_only_executables" will give + you this behavior. --Waz + + If I have in my .tcshrc: complete {cd,pushd} p/1/d/ and I type + "complete cd" at the shell prompt nothing is printed. It would be nice + if {cd,pushd} p/1/d/ was printed. + + --> I had programmed this feature a while ago but have not submitted + it because the implementation is not robust enough to keep TCSH from + crashing when special characters are part of the pattern. I'll get + back to it at some point! --Waz + + It would be nice if "set autolist" would be on by default. + + --- + + Unicode (UTF-8) doesn't seem to work. It's not even possible to "make + catalogs" in unicode environment. Also unicode support (and other + multibyte encodings) should depend on environment variables + (LC_CTYPE), not on "set dspmbyte". On unicode terminal translations + show empty characters instead of messages. + + In addition to message catalogs, there are more problems: +ipi:~/test/tcsh/bin> ls +tcsh åäö +ipi:~/test/tcsh/bin> set dspmbyte utf8 +ipi:~/test/tcsh/bin> ls ??? +ls: No match. + + Unicode is used more and more, and is default on many environments, so + this really should be fixed. --mpaananen _________________________________________________________________ - Add instructions for using configure in the README file. + When I have a script called from complete I would like to have the the + existing text from the command line passed to that script so that it + can look at all existing words to detemine what it should output as + the completion list. + + For example: + + complete prog 'n/-x/`myscript`' + + Then when I do this: + + > prog -a A -b B -x + + The script would get 'prog -a A -b B -x ' which would allow the script + to base its -x completions on the options given for -a and -b (or if + they aren't present give nothing - or a message saying that they are + required). Setting a temporary environment variable before executing + the command would also work and would probably be safer. + + Perhaps this info is already available as a special variable that can + be manually passed to the script: complete prog 'n/-x/`myscript + $cmd_line`'? + + Update: I looked into this further by actually downloading the code + and looking through it. It doesn't seem that this information is + available anywhere, but I did manage to achieve what I wanted by + adding the following two lines around the call to tw_complete (line + 278, tw.parse.c 6.12.00): + + added> tsetenv(STRCURRCMDLINE, (Char *)&qline); + looking = tw_complete(cmd_start, &wordp, &pat, looking, &suf); + + added> Unsetenv(STRCURRCMDLINE); + + And I added a definition for STRCURRCMDLINE to be "CURRCMDLINE". + + This provides the environment variable CURRCMDLINE to any + script/program running under complete. The only issue I see is picking >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 11 03:49:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6248B16A4D0; Sun, 11 Jul 2004 03:49:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 264DF16A4CE for ; Sun, 11 Jul 2004 03:49:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2022543D1F for ; Sun, 11 Jul 2004 03:49:53 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B3nrKm055599 for ; Sun, 11 Jul 2004 03:49:53 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B3nqBt055596 for perforce@freebsd.org; Sun, 11 Jul 2004 03:49:52 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 03:49:52 GMT Message-Id: <200407110349.i6B3nqBt055596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 03:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=57037 Change 57037 by davidxu@davidxu_alona on 2004/07/11 03:49:34 Add a bit flag THR_SIGNAL_THREAD, libthread_db uses it to identify a signal thread. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#7 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_sig.c#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#7 (text+ko) ==== @@ -430,6 +430,7 @@ int prio; int suspend; #define THR_STACK_USER 0x100 /* 0xFF reserved for */ +#define THR_SIGNAL_THREAD 0x200 /* This is a signal thread */ int flags; void *arg_attr; void (*cleanup_attr) (); ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_sig.c#3 (text+ko) ==== @@ -232,6 +232,7 @@ pthread_sigmask(SIG_SETMASK, &sigset, &oldset); pthread_attr_init(&attr); pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); + attr->flags |= THR_SIGNAL_THREAD; /* sigmask will be inherited */ if (pthread_create(&_thr_sig_daemon, &attr, sig_daemon, NULL)) PANIC("can not create signal daemon thread!\n"); From owner-p4-projects@FreeBSD.ORG Sun Jul 11 03:52:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D06C16A4D1; Sun, 11 Jul 2004 03:52:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6773616A4CF for ; Sun, 11 Jul 2004 03:52:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4881C43D1D for ; Sun, 11 Jul 2004 03:52:57 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B3qvEt055734 for ; Sun, 11 Jul 2004 03:52:57 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B3qukI055731 for perforce@freebsd.org; Sun, 11 Jul 2004 03:52:56 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 03:52:56 GMT Message-Id: <200407110352.i6B3qukI055731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 03:52:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=57038 Change 57038 by davidxu@davidxu_alona on 2004/07/11 03:52:28 use ps_lstop, ps_lcontinue to stop/resume bound thread, however signal thread won't be stopped. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#7 edit .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#7 (text+ko) ==== @@ -444,6 +444,8 @@ { struct pthread pt; pt_thragent_t *ta = (pt_thragent_t *)th->th_ta_p; + psaddr_t tcb_addr; + uint32_t dflags; int ret; TDBG_FUNC(); @@ -468,12 +470,15 @@ return (P2T(ret)); if (pt.magic != THR_MAGIC) return (TD_BADTH); + tcb_addr = (psaddr_t) pt.tcb; ret = ps_pdread(ta->ph, - ((psaddr_t)pt.tcb) + offsetof(struct tcb, tcb_tmbx.tm_lwp), + tcb_addr + offsetof(struct tcb, tcb_tmbx.tm_lwp), &info->ti_lid, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); - + ret = ps_pdread(ta->ph, + tcb_addr + offsetof(struct tcb, tcb_tmbx.tm_dflags), + &dflags, sizeof(dflags)); info->ti_ta_p = th->th_ta_p; info->ti_tid = th->th_unique; info->ti_tls = (char *)pt.specific; @@ -503,7 +508,7 @@ break; } - info->ti_db_suspended = 0; + info->ti_db_suspended = ((dflags & TMDF_DONOTRUNUSER) != 0); info->ti_type = TD_THR_USER; info->ti_pri = pt.active_priority; info->ti_sigmask = pt.sigmask; @@ -815,14 +820,10 @@ return (ret); if (ta->map[th->th_unique].type == PT_LWP) { -#if 0 if (suspend) ret = ps_lstop(ta->ph, ta->map[th->th_unique].lwp); else ret = ps_lcontinue(ta->ph, ta->map[th->th_unique].lwp); -#else - ret = 0; -#endif return (P2T(ret)); } @@ -841,15 +842,18 @@ ret = ps_pdread(ta->ph, ptr, &lwp, sizeof(lwpid_t)); if (ret != 0) return (P2T(ret)); + /* + * don't stop lwp assigned to a M:N thread, it belongs + * to UTS, UTS shouldn't be stopped. + */ if (lwp != 0 && (attrflags & PTHREAD_SCOPE_SYSTEM)) { -#if 0 + /* dont' suspend signal thread */ + if (attrflags & THR_SIGNAL_THREAD) + return 0; if (suspend) ret = ps_lstop(ta->ph, lwp); else ret = ps_lcontinue(ta->ph, lwp); -#else - ret = 0; -#endif return (P2T(ret)); } ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jul 11 03:55:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82D8E16A4D1; Sun, 11 Jul 2004 03:55:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C41F16A4CF for ; Sun, 11 Jul 2004 03:55:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 547F743D1D for ; Sun, 11 Jul 2004 03:55:00 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B3t0Xj055762 for ; Sun, 11 Jul 2004 03:55:00 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B3sxk0055759 for perforce@freebsd.org; Sun, 11 Jul 2004 03:54:59 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 03:54:59 GMT Message-Id: <200407110354.i6B3sxk0055759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 03:55:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=57039 Change 57039 by davidxu@davidxu_alona on 2004/07/11 03:54:31 Implement ps_lstop/ps_lcontinue. Use td_thr_dbsuspend/td_thr_dbresume to suspend/resume thread, yeah! M:N thread debugging works now. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#10 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#10 (text+ko) ==== @@ -68,11 +68,9 @@ /* Connection to the libthread_db library. */ static td_thragent_t *thread_agent; -/* The inactive M:N thread gdb is trying to single step it */ -static ptid_t single_step_inactive_thread; +/* The last thread we are single stepping */ +static ptid_t last_single_step_thread; -static CORE_ADDR single_step_inactive_thread_pc; - /* Pointers to the libthread_db functions. */ static td_err_e (*td_init_p) (void); @@ -111,6 +109,9 @@ static td_err_e (*td_ta_tsd_iter_p) (const td_thragent_t *ta, td_key_iter_f *func, void *data); +static td_err_e (*td_thr_dbsuspend_p) (const td_thrhandle_t *); +static td_err_e (*td_thr_dbresume_p) (const td_thrhandle_t *); + /* Prototypes for local functions. */ static void fbsd_thread_find_new_threads (void); @@ -362,6 +363,18 @@ child_ops.to_detach (args, from_tty); } +static int +suspend_thread_callback (const td_thrhandle_t *th_p, void *data) +{ + return td_thr_dbsuspend_p (th_p); +} + +static int +resume_thread_callback (const td_thrhandle_t *th_p, void *data) +{ + return td_thr_dbresume_p (th_p); +} + static void fbsd_thread_resume (ptid_t ptid, int step, enum target_signal signo) { @@ -369,17 +382,19 @@ td_thrinfo_t ti; ptid_t work_ptid; int resume_all, ret; - long lwp; + long lwp, thvalid = 0; #if 0 printf_filtered("%s ptid=%ld.%ld.%ld step=%d\n", __func__, GET_PID(ptid), GET_LWP(ptid), GET_THREAD(ptid), step); printf_filtered("%s inferior_ptid=%ld.%ld.%ld\n", __func__, - GET_PID(inferior_ptid), GET_LWP(inferior_ptid), GET_THREAD(inferior_ptid)); + GET_PID(inferior_ptid), GET_LWP(inferior_ptid), + GET_THREAD(inferior_ptid)); #endif + if (proc_handle.pid == 0) { - child_resume (ptid, step, signo); + base_ops.to_resume (ptid, step, signo); return; } @@ -416,30 +431,8 @@ ret = td_thr_get_info_p (&th, &ti); if (ret) error (thread_db_err_str (ret)); + thvalid = 1; lwp = ti.ti_lid; - /* - * if we are single stepping an inactive M:N thread, - * we insert all breakpoints, and resume all threads, - * the inactive thread may or may not be scheduled to - * run, but if it runs, it may hit a breakpoint and - * becomes the current event thread, after it hit a - * breakpoint, the thread will stay in kernel until - * debugger resumes it. In that case, gdb will single - * step it again, but because it was already an active - * thread, we can use ptrace to resume it just as 1:1 - * thread. XXX This may not be needed, because gdb - * seems not switch away from event thread when resuming. - */ - if (lwp == 0) - { - if (breakpoint_here_p (read_pc_pid (work_ptid)) != - no_breakpoint_here) - { - single_step_inactive_thread_pc = read_pc_pid (work_ptid); - single_step_inactive_thread = work_ptid; - insert_breakpoints (); - } - } } if (lwp) @@ -448,13 +441,43 @@ if (ptrace (req, (pid_t) lwp, (caddr_t) 1, target_signal_to_host(signo))) perror_with_name ("PT_SETSTEP/PT_CLEARSTEP"); } + + if (!ptid_equal (last_single_step_thread, null_ptid)) + { + ret = td_ta_thr_iter_p (thread_agent, resume_thread_callback, NULL, + TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, + TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); + if (ret != TD_OK) + error ("resume error: %s", thread_db_err_str (ret)); + } + + if (!resume_all) + { + ret = td_ta_thr_iter_p (thread_agent, suspend_thread_callback, NULL, + TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, + TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); + if (ret != TD_OK) + error ("suspend error: %s", thread_db_err_str (ret)); + last_single_step_thread = work_ptid; + } else - resume_all = 1; + last_single_step_thread = null_ptid; - if (resume_all) - lwp = proc_handle.pid; + if (thvalid) + { + ret = td_thr_dbresume_p (&th); + if (ret != TD_OK) + error ("resume error: %s", thread_db_err_str (ret)); + } + else + { + /* it is not necessary, put it here for completness */ + ret = ptrace(PT_RESUME, lwp, 0, 0); + } - if (ptrace (PT_CONTINUE, (pid_t) lwp, (caddr_t)1, target_signal_to_host(signo))) + /* now continue the process, suspended thread wont run */ + if (ptrace (PT_CONTINUE, proc_handle.pid , (caddr_t)1, + target_signal_to_host(signo))) perror_with_name ("PT_CONTINUE"); } @@ -473,25 +496,8 @@ ret = thread_from_lwp (BUILD_LWP (lwp, GET_PID (ret))); if (!in_thread_list (ret)) add_thread (ret); - /* - * if we previously single stepping inactive threads, - * the inactive threads now becomes active, - * we should tell gdb to ignore the event and resume - * thread again. - */ - if (ourstatus->value.sig == TARGET_SIGNAL_TRAP) - { - stop_pc = read_pc_pid (ret) - DECR_PC_AFTER_BREAK; - if (ptid_equal(ret, single_step_inactive_thread) && - stop_pc == single_step_inactive_thread_pc) - { - ourstatus->kind = TARGET_WAITKIND_SPURIOUS; - } - } } - single_step_inactive_thread = minus_one_ptid; - single_step_inactive_thread_pc = 0; return (ret); } @@ -921,6 +927,14 @@ if (td_ta_tsd_iter_p == NULL) return 0; + td_thr_dbsuspend_p = dlsym (handle, "td_thr_dbsuspend"); + if (td_thr_dbsuspend_p == NULL) + return 0; + + td_thr_dbresume_p = dlsym (handle, "td_thr_dbresume"); + if (td_thr_dbresume_p == NULL) + return 0; + /* Initialize the library. */ err = td_init_p (); if (err != TD_OK) @@ -1061,6 +1075,18 @@ return PS_OK; } +ps_err_e +ps_lstop(struct ps_prochandle *ph, lwpid_t lwpid) +{ + return (ptrace (lwpid, PT_SUSPEND, 0, 0) == 0); +} + +ps_err_e +ps_lcontinue(struct ps_prochandle *ph, lwpid_t lwpid) +{ + return (ptrace (lwpid, PT_RESUME, 0, 0) == 0); +} + pid_t ps_getpid (struct ps_prochandle *ph) { From owner-p4-projects@FreeBSD.ORG Sun Jul 11 03:56:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6524116A4D1; Sun, 11 Jul 2004 03:56:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F95516A4CF for ; Sun, 11 Jul 2004 03:56:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1270443D2F for ; Sun, 11 Jul 2004 03:56:02 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B3u1Eh055841 for ; Sun, 11 Jul 2004 03:56:01 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B3u1Ck055838 for perforce@freebsd.org; Sun, 11 Jul 2004 03:56:01 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 03:56:01 GMT Message-Id: <200407110356.i6B3u1Ck055838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57040 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 03:56:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=57040 Change 57040 by davidxu@davidxu_alona on 2004/07/11 03:55:06 Only check TDF_DBSUSPEND when P_TRACED is turned on. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#7 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#7 (text+ko) ==== @@ -2014,7 +2014,7 @@ td->td_flags |= TDF_XSIG; mtx_unlock_spin(&sched_lock); td->td_xsig = sig; - while (td->td_flags & TDF_XSIG) { + while ((p->p_flag & P_TRACED) && (td->td_flags & TDF_XSIG)) { if (p->p_flag & P_SINGLE_EXIT) { mtx_lock_spin(&sched_lock); td->td_flags &= ~TDF_XSIG; @@ -2047,6 +2047,8 @@ mtx_unlock_spin(&sched_lock); PICKUP_GIANT(); PROC_LOCK(p); + if (!(p->p_flag & P_TRACED)) + break; if (td->td_flags & TDF_DBSUSPEND) { if (p->p_flag & P_SINGLE_EXIT) break; From owner-p4-projects@FreeBSD.ORG Sun Jul 11 09:23:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 279F516A4D0; Sun, 11 Jul 2004 09:23:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC73D16A4CE for ; Sun, 11 Jul 2004 09:23:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E388543D41 for ; Sun, 11 Jul 2004 09:23:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6B9Nocr064816 for ; Sun, 11 Jul 2004 09:23:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6B9NmTK064813 for perforce@freebsd.org; Sun, 11 Jul 2004 09:23:48 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 09:23:48 GMT Message-Id: <200407110923.i6B9NmTK064813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 09:23:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=57058 Change 57058 by davidxu@davidxu_alona on 2004/07/11 09:23:41 IFC @57055 Affected files ... .. //depot/projects/davidxu_ksedbg/src/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/Makefile.inc1#2 integrate .. //depot/projects/davidxu_ksedbg/src/UPDATING#3 integrate .. //depot/projects/davidxu_ksedbg/src/bin/csh/config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/AUTHORS#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/BUGS#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/COPYING#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/ChangeLog#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/INSTALL#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/MIRRORS#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/amd/NEWS#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/README#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/README.y2k#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_inherit.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/map.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/bootstrap#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/commit#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/hn_dref/hn_dref_default.h#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/mount/mount_default.c#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/config.guess#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/config.guess.long#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/config.sub#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/configure.in#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/cvs-server.txt#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/depcomp#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/doc/mdate-sh#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/install-sh#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/util.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/ltmain.sh#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/c_void_p.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/cache_check_dynamic.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_amu_fs.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_checkmount_style.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_extern.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_fhandle.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_field.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_fs_headers.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_fs_mntent.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_gnu_getopt.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_hide_mount_type.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_lib2.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_map_funcs.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mnttab_file_name.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mnttab_location.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mnttab_opt.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mnttab_style.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mnttab_type.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mount_style.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mount_trap.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mount_type.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mtype_printf_type.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_mtype_type.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_network_transport_type.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_nfs_fh_dref.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_nfs_hn_dref.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_nfs_prot_headers.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_nfs_sa_dref.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_nfs_socket_connection.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_os_libs.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_restartable_signal_handler.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_umount_style.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_unmount_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/check_unmount_call.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/expand_cpp_hex.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/expand_cpp_int.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/expand_cpp_string.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/expand_run_string.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/extern_optarg.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/extern_sys_errlist.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/func_bad_memcmp.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/func_bad_yp_all.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/header_templates.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/host_macros.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/linux_headers.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/localconfig.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/mount_headers.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/name_package.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/name_version.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/opt_amu_cflags.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/opt_cppflags.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/opt_debug.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/opt_ldflags.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/opt_libs.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/os_cflags.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/os_cppflags.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/os_ldflags.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/package_bugreport.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/package_name.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/package_version.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/save_state.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/struct_field_nfs_fh.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/struct_mntent.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/struct_mnttab.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/struct_nfs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/struct_nfs_fh.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/struct_nfs_fh3.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/try_compile_anyfs.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/try_compile_nfs.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/try_compile_rpc.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_auth_create_gidlist.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_cachefs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_cdfs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_efs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_lofs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_mfs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_pcfs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_rfs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_svc_in_arg.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_time_t.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_tmpfs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_ufs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_xdrproc_t.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_xfs_args.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/type_yp_order_outorder.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/m4/macros/with_addon.m4#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/missing#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/mkinstalldirs#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/scripts/lostaltmail.conf-sample#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/scripts/lostaltmail.in#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/amd/tasks#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/binutils/bfd/elf32-ppc.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/binutils/bfd/libxcoff.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/binutils/include/coff/xcoff.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/binutils/ld/emultempl/ppc32elf.em#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/cvs/src/log.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/cvs/src/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/FREEBSD-upgrade#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/version-etc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/src/sort.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/client/dhclient.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/common/dispatch.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/includes/dhcpd.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/omapip/dispatch.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/omapip/mrtrace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/libngatm/cccust.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/libngatm/sscfucust.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/libngatm/sscopcust.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/libngatm/unimsg.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/man/libngatm.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/man/uniaddr.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/man/unifunc.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/man/unisap.3#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/man/unistruct.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/sscop/common.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/sscop/common.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/sscop/sscop.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/ngatm/sscop/sscop_main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/FAQ#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/FREEBSD-Xlist#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/Fixes#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/README#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/WishList#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/configure#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/configure.in#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/csh-mode.el#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/glob.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/glob.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/host.defs#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/ma.setp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/C/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/et/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/finnish/set14#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/finnish/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/french/set11#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/french/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/german/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/greek/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/italian/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/ja/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/spanish/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.set.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/top.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/etc/devd.conf#2 integrate .. //depot/projects/davidxu_ksedbg/src/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/davidxu_ksedbg/src/etc/services#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/lib/libregex/FREEBSD-upgrade#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/Makefile.inc#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/Makefile.inc0#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/amd64-freebsd/config.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/config.h#1 branch .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/i386-freebsd/config.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/powerpc-freebsd/Makefile#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/sparc64-freebsd/Makefile#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/ld/Makefile.alpha#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/ld/Makefile.amd64#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/ld/Makefile.i386#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/ld/Makefile.ia64#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/ld/Makefile.m68k#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/ld/Makefile.powerpc#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/ld/Makefile.sparc64#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/Makefile.alpha#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/Makefile.ia64#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/alpha/bfd.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/amd64/bfd.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/bfd.h#1 branch .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/i386/bfd.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/libbfd/sparc64/bfd.h#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/Makefile.inc#3 integrate .. //depot/projects/davidxu_ksedbg/src/include/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/include/ftw.h#1 branch .. //depot/projects/davidxu_ksedbg/src/include/strings.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/include/wctype.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_db.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_ftp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_irc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_local.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_nbt.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_pptp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_proxy.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_skinny.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_smedia.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libalias/alias_util.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/alpha/gen/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/alpha/gen/isinf.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/amd64/gen/isinf.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libc/arm/gen/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/arm/gen/isinf.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/ftw.3#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/ftw.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/isinf.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/isnan.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/shm_open.3#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/i386/gen/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/i386/gen/isinf.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libc/ia64/gen/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/ia64/gen/isinf.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/nextwctype.3#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/nextwctype.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/net/eui64.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/posix1e/acl_delete.3#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/powerpc/gen/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/powerpc/gen/isinf.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex.3#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sparc64/gen/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sparc64/gen/isinf.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/fgetwc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdlib/getopt_long.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/intro.2#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libngatm/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libsdp/sdp.3#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libutil/humanize_number.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/man/rint.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/math.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_isfinite.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_isnormal.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_nearbyint.c#1 branch .. //depot/projects/davidxu_ksedbg/src/libexec/tftpd/tftpd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/concat/gconcat.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/concat/geom_concat.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/label/glabel.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/stripe/geom_stripe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/stripe/gstripe.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/core/geom.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/growfs/debug.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/md5/md5.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/pfctl/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/examples/mdoc/example.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man3/pthread_spin_lock.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man3/queue.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/acpi.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ath.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/cm.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/esp.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/fatm.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/hatm.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ixgb.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/acpi_asus.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/arl.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/cp.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/ct.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/fe.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/ndis.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/pae.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/matcd.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/meteor.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/mpt.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/multicast.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/natmip.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ncv.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ng_atm.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ng_atmllc.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ng_atmpif.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ng_sppp.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ng_sscfu.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ng_sscop.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ng_uni.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/nsp.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/patm.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/pcm.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/pim.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ppbus.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/rc.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/re.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/sab.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/safe.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/sbp_targ.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/stg.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/tcp.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/tx.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/uaudio.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ubser.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/udav.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ufm.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/umct.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/utopia.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/xe.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man5/bluetooth.hosts.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man5/bluetooth.protocols.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man5/eui64.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man5/make.conf.5#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/hier.7#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/tuning.7#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man8/rc.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man8/rc.subr.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/BUS_ADD_CHILD.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/BUS_CONFIG_INTR.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/VOP_LISTEXTATTR.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/VOP_LOOKUP.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/alq.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/cr_seeothergids.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/cr_seeotheruids.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_access.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_attach.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_bio.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_data.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_event.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_geom.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_provider.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_provider_by_name.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/g_wither_geom.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/hexdump.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ieee80211_crypto.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ieee80211_input.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ieee80211_ioctl.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ieee80211_output.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ieee80211_proto.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ieee80211_radiotap.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/ithread.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/mbpool.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/mbuf.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/mutex.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pci.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/physio.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_activate.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_addr_hint.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_change_wiring.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_clear_modify.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_copy.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_enter.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_extract.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_growkernel.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_init.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_is_modified.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_is_prefaultable.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_map.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_mincore.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_object_init_pt.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_page_exists_quick.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_page_protect.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_pinit.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_qenter.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_release.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_remove.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_resident_count.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/pmap_zero_page.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/prison_check.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/runqueue.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/sbuf.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/sema.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/signal.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/swi.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/utopia.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vfs_suser.9#1 branch .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_fault_prefault.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_check_protection.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_clean.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_create.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_delete.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_find.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_findspace.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_inherit.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_init.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_insert.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_lock.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_lookup.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_madvise.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_max.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_protect.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_remove.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_simplify_entry.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_stack.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_submap.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vm_map_wire.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/watchdog.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/autoconf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/interrupt.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/alpha/include/kdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/alpha/include/pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/amd64-gdbstub.c#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/float.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.alpha#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.amd64#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.i386#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.ia64#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.pc98#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options.alpha#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/addr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/atmapi.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_data.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_dump.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_port.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_sig.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/cc_user.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/ccatm.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/ccpriv.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/unisap.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/api/unisap.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/genfiles#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/misc/straddr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/misc/unimsg_common.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/geniec.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/genieh.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/ie.def#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/msg.def#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/parseie.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/priv.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/privmsg.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/traffic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/uni_config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/unimsglib.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/uniprint.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/msg/unistruct.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/saal/sscfu.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/saal/sscfudef.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/saal/sscfupriv.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/saal/sscop.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/saal/sscopdef.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/saal/sscoppriv.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_call.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_coord.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_party.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_print.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_reset.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_uni.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/sig_verify.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/uni.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/unidef.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/unimkmsg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/unipriv.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/sig/unisig.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ngatm/netnatm/unimsg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_access.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_break.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_elf.c#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_kld.c#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_main.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_print.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_run.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_sysctl.c#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_thread.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_trap.c#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_variables.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_variables.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ct/ct.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_isa.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_pccard.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdcvar.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/led/led.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ncv/ncr53c500.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sab/sab.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sio/sio.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_dbg.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/vinum/vinumhdr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vinum/vinuminterrupt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vinum/vinumioctl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vinum/vinummemory.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/zs/zs.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/gdb/gdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/gdb/gdb_int.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/gdb/gdb_main.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/gdb/gdb_packet.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_event.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_int.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/gnu/ext2fs/ext2_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/autoconf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/db_interface.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/gdb_machdep.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/i386-gdbstub.c#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/db_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/frame.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/gdb_machdep.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/kdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/isa.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/pcvt/pcvt_kbd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/autoconf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/gdb_machdep.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/ia64-gdbstub.c#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/unwind.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/db_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/gdb_machdep.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/kdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/unwind.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/isa/orm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_subr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_switch.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_kdb.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#9 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_init.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/de/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/nfs4client/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/bpf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/bridge.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_disc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_faith.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_gif.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_gre.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/rtsock.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fdc_cbus.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fdcvar.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/isa_dma.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/pc98.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/sio.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_dc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_de.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_devar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_rl.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sf.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_ti.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_vr.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_xl.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/ncr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/stdarg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/pmap.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/creator/creator_upa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/db_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/gdb_machdep.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/kdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/gdb_machdep.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/kdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/sys/mount.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/param.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/systm.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/uio.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/install.sh#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 11 10:08:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E900116A4D0; Sun, 11 Jul 2004 10:08:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C35BF16A4CE for ; Sun, 11 Jul 2004 10:08:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A756B43D39 for ; Sun, 11 Jul 2004 10:08:45 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6BA8jI0066196 for ; Sun, 11 Jul 2004 10:08:45 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6BA8jX8066193 for perforce@freebsd.org; Sun, 11 Jul 2004 10:08:45 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 10:08:45 GMT Message-Id: <200407111008.i6BA8jX8066193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 10:08:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=57060 Change 57060 by davidxu@davidxu_alona on 2004/07/11 10:08:39 Remove ttrace Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#4 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#4 (text+ko) ==== @@ -129,8 +129,6 @@ __BEGIN_DECLS int ptrace(int _request, pid_t _pid, caddr_t _addr, int _data); -int ttrace(int _request, pid_t _pid, lwpid_t _tid, caddr_t _addr, - int _data); __END_DECLS #endif /* !_KERNEL */ From owner-p4-projects@FreeBSD.ORG Sun Jul 11 10:18:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B01EF16A4CE; Sun, 11 Jul 2004 10:18:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73CEE16A4CE for ; Sun, 11 Jul 2004 10:18:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F16C43D39 for ; Sun, 11 Jul 2004 10:18:59 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6BAIxss066599 for ; Sun, 11 Jul 2004 10:18:59 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6BAIxdp066596 for perforce@freebsd.org; Sun, 11 Jul 2004 10:18:59 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 10:18:59 GMT Message-Id: <200407111018.i6BAIxdp066596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 10:19:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=57063 Change 57063 by davidxu@davidxu_alona on 2004/07/11 10:18:28 Fix $FreeBSD$ Affected files ... .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/trap/trap_default.h#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/trap/trap_default.h#3 (text+ko) ==== @@ -1,2 +1,4 @@ +//depot/vendor/freebsd/src/contrib/amd/conf/trap/trap_default.h#3 - add change 56618 (text+ko) +/* $FreeBSD: src/contrib/amd/conf/trap/trap_default.h,v 1.3 2004/07/06 14:14:26 mbr Exp $ */ /* $srcdir/conf/trap/trap_default.h */ #define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data) From owner-p4-projects@FreeBSD.ORG Sun Jul 11 10:22:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC9C516A4D0; Sun, 11 Jul 2004 10:22:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 874F416A4CE for ; Sun, 11 Jul 2004 10:22:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8283D43D2F for ; Sun, 11 Jul 2004 10:22:03 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6BAM3Tj066725 for ; Sun, 11 Jul 2004 10:22:03 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6BAM3I5066722 for perforce@freebsd.org; Sun, 11 Jul 2004 10:22:03 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 11 Jul 2004 10:22:03 GMT Message-Id: <200407111022.i6BAM3I5066722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 10:22:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=57064 Change 57064 by davidxu@davidxu_alona on 2004/07/11 10:21:29 Remove accidently added line. Affected files ... .. //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/trap/trap_default.h#4 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/contrib/amd/conf/trap/trap_default.h#4 (text+ko) ==== @@ -1,4 +1,3 @@ -//depot/vendor/freebsd/src/contrib/amd/conf/trap/trap_default.h#3 - add change 56618 (text+ko) /* $FreeBSD: src/contrib/amd/conf/trap/trap_default.h,v 1.3 2004/07/06 14:14:26 mbr Exp $ */ /* $srcdir/conf/trap/trap_default.h */ #define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data) From owner-p4-projects@FreeBSD.ORG Sun Jul 11 18:13:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31A8116A4D0; Sun, 11 Jul 2004 18:13:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E43E816A4CE for ; Sun, 11 Jul 2004 18:13:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D90F443D3F for ; Sun, 11 Jul 2004 18:13:45 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6BIDjXh081299 for ; Sun, 11 Jul 2004 18:13:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6BIDjdJ081296 for perforce@freebsd.org; Sun, 11 Jul 2004 18:13:45 GMT (envelope-from marcel@freebsd.org) Date: Sun, 11 Jul 2004 18:13:45 GMT Message-Id: <200407111813.i6BIDjdJ081296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 18:13:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=57097 Change 57097 by marcel@marcel_nfs on 2004/07/11 18:12:52 IFC @57096 Affected files ... .. //depot/projects/gdb/UPDATING#21 integrate .. //depot/projects/gdb/games/bcd/Makefile#2 integrate .. //depot/projects/gdb/games/bcd/bcd.c#2 integrate .. //depot/projects/gdb/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/gdb/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/gdb/share/man/man9/sx.9#5 integrate .. //depot/projects/gdb/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_fil.c#5 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#13 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#12 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#12 integrate .. //depot/projects/gdb/sys/dev/digi/digi.h#4 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#11 integrate .. //depot/projects/gdb/sys/dev/rp/rp.c#8 integrate .. //depot/projects/gdb/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/gdb/sys/dev/si/si.c#9 integrate .. //depot/projects/gdb/sys/dev/si/si.h#3 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#20 integrate .. //depot/projects/gdb/sys/dev/sx/sx.c#8 integrate .. //depot/projects/gdb/sys/dev/sx/sx.h#3 integrate .. //depot/projects/gdb/sys/doc/Doxyfile#1 branch .. //depot/projects/gdb/sys/doc/Makefile#1 branch .. //depot/projects/gdb/sys/i386/isa/clock.c#13 integrate .. //depot/projects/gdb/sys/kern/device_if.m#2 integrate .. //depot/projects/gdb/sys/kern/subr_kdb.c#19 integrate .. //depot/projects/gdb/sys/kern/tty.c#13 integrate .. //depot/projects/gdb/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/gdb/sys/pc98/pc98/clock.c#6 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#17 integrate .. //depot/projects/gdb/sys/sys/param.h#19 integrate .. //depot/projects/gdb/sys/sys/sx.h#3 integrate .. //depot/projects/gdb/sys/sys/tty.h#12 integrate .. //depot/projects/gdb/sys/tools/makeobjops.awk#3 integrate .. //depot/projects/gdb/usr.bin/split/split.1#2 integrate .. //depot/projects/gdb/usr.bin/split/split.c#2 integrate Differences ... ==== //depot/projects/gdb/UPDATING#21 (text+ko) ==== @@ -17,6 +17,36 @@ developers choose to disable these features on build machines to maximize performance. +20040710: + __FreeBSD_version bumped to 502122. + +20040710: + The console initialization on Alpha has been reworked and is now + identical to other platforms. This means that the hardcoding of + the serial console and the debug port has been removed. As such, + hints are now required for the sio(4) driver to become a console + or debug port. The NO_SIO option has been decommissioned because + of this. + +20040710: + A revamp of the debugging code in the kernel with some visible + changes beyond just the debugging experience: + o The DDB option is now specific to the DDB debugger backend + and should not be used any more for conditional compilation + of debugging code for when debugging is enabled. Use the KDB + option for this. + o The WITNESS_DDB, DDB_TRACE and DDB_UNATTENDED options have + been renamed to WITNESS_KDB, KDB_TRACE and KDB_UNATTENDED + respectively. This is in line with the first bullet. + o The remote GDB support has been untangled from DDB and needs + to be enabled seperately now. Use the GDB option for this. + o The GDB_REMOTE_CHAT option has been removed. Support for this + homegrown feature is discontinued. The GDB remote protocol + supports console output and it makes sense to use that. + o The DDB_NOKLDSYM option has been removed. The DDB debugger + now supports both direct symbol table lookups as well as KLD + symbol lookups through the linker. + 20040708: Bluetooth code has been marked as non-i386 specific. __FreeBSD_version has been bumped to 502121 to mark this change. @@ -24,7 +54,7 @@ 20040702: The native preemption has been added to the kernel scheduler. There is some report that ULE scheduler was broken in some - machines and we encourage users using ULE schedluer either + machines and we encourage users using ULE scheduler either stick with an known good kernel, or temporary switch to 4BSD scheduler as a workaround. @@ -1684,4 +1714,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.323 2004/07/09 16:57:24 emax Exp $ +$FreeBSD: src/UPDATING,v 1.325 2004/07/11 13:26:44 simon Exp $ ==== //depot/projects/gdb/games/bcd/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/bcd/Makefile,v 1.5 2001/03/26 14:20:54 ru Exp $ +# $FreeBSD: src/games/bcd/Makefile,v 1.6 2004/07/11 17:26:18 stefanf Exp $ PROG= bcd +WARNS?= 6 MAN= bcd.6 MLINKS= bcd.6 ppt.6 ==== //depot/projects/gdb/games/bcd/bcd.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bcd.c 8.2 (Berkeley) 3/20/94"; #endif static const char rcsid[] = - "$FreeBSD: src/games/bcd/bcd.c,v 1.8 1999/11/30 03:48:41 billf Exp $"; + "$FreeBSD: src/games/bcd/bcd.c,v 1.9 2004/07/11 17:26:18 stefanf Exp $"; #endif /* not lint */ /* @@ -80,9 +80,11 @@ #include +#include #include +#include #include -#include +#include u_short holes[256] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, @@ -119,15 +121,15 @@ 0x202, 0x201, 0x082, 0x806, 0x822, 0x600, 0x282, 0x0 }; +void printcard(char *); + /* * i'th bit of w. */ #define bit(w,i) ((w)&(1<<(i))) int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { char cardline[80]; @@ -150,16 +152,15 @@ #define COLUMNS 48 -printcard(str) - char *str; +void +printcard(char *str) { static char rowchars[] = " 123456789"; int i, row; char *p; - char *index(); /* ruthlessly remove newlines and truncate at 48 characters. */ - if ((p = index(str, '\n'))) + if ((p = strchr(str, '\n'))) *p = '\0'; if (strlen(str) > COLUMNS) @@ -183,7 +184,7 @@ p = str; putchar('/'); for (i = 1; *p; i++, p++) - if (holes[*p]) + if (holes[(unsigned char)*p]) putchar(*p); else putchar(' '); @@ -201,7 +202,7 @@ for (row = 0; row <= 11; ++row) { putchar('|'); for (i = 0, p = str; *p; i++, p++) { - if (bit(holes[*p], 11 - row)) + if (bit(holes[(unsigned char)*p], 11 - row)) putchar(']'); else putchar(rowchars[row]); ==== //depot/projects/gdb/lib/libc/regex/regcomp.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.30 2003/02/16 17:29:10 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.31 2004/07/11 05:58:31 tjr Exp $"); #include #include @@ -106,17 +106,6 @@ static int freezeset(struct parse *p, cset *cs); static int firstch(struct parse *p, cset *cs); static int nch(struct parse *p, cset *cs); -static void mcadd(struct parse *p, cset *cs, char *cp) __unused; -#if used -static void mcsub(cset *cs, char *cp); -static int mcin(cset *cs, char *cp); -static char *mcfind(cset *cs, char *cp); -#endif -static void mcinvert(struct parse *p, cset *cs); -static void mccase(struct parse *p, cset *cs); -static int isinsets(struct re_guts *g, int c); -static int samesets(struct re_guts *g, int c1, int c2); -static void categorize(struct parse *p, struct re_guts *g); static sopno dupl(struct parse *p, sopno start, sopno finish); static void doemit(struct parse *p, sop op, size_t opnd); static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos); @@ -124,7 +113,7 @@ static void enlarge(struct parse *p, sopno size); static void stripsnug(struct parse *p, struct re_guts *g); static void findmust(struct parse *p, struct re_guts *g); -static int altoffset(sop *scan, int offset, int mccs); +static int altoffset(sop *scan, int offset); static void computejumps(struct parse *p, struct re_guts *g); static void computematchjumps(struct parse *p, struct re_guts *g); static sopno pluscount(struct parse *p, struct re_guts *g); @@ -216,8 +205,7 @@ len = strlen((char *)pattern); /* do the mallocs early so failure handling is easy */ - g = (struct re_guts *)malloc(sizeof(struct re_guts) + - (NC-1)*sizeof(cat_t)); + g = (struct re_guts *)malloc(sizeof(struct re_guts)); if (g == NULL) return(REG_ESPACE); p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ @@ -252,9 +240,6 @@ g->matchjump = NULL; g->mlen = 0; g->nsub = 0; - g->ncategories = 1; /* category 0 is "everything else" */ - g->categories = &g->catspace[-(CHAR_MIN)]; - (void) memset((char *)g->catspace, 0, NC*sizeof(cat_t)); g->backrefs = 0; /* do it */ @@ -270,7 +255,6 @@ g->laststate = THERE(); /* tidy up loose ends and fill things in */ - categorize(p, g); stripsnug(p, g); findmust(p, g); /* only use Boyer-Moore algorithm if the pattern is bigger @@ -516,9 +500,7 @@ * Giving end1 as OUT essentially eliminates the end1/end2 check. * * This implementation is a bit of a kludge, in that a trailing $ is first - * taken as an ordinary character and then revised to be an anchor. The - * only undesirable side effect is that '$' gets included as a character - * category in such cases. This is fairly harmless; not worth fixing. + * taken as an ordinary character and then revised to be an anchor. * The amount of lookahead needed to avoid this kludge is excessive. */ static void @@ -739,8 +721,6 @@ if (ci != i) CHadd(cs, ci); } - if (cs->multis != NULL) - mccase(p, cs); } if (invert) { int i; @@ -752,12 +732,8 @@ CHadd(cs, i); if (p->g->cflags®_NEWLINE) CHsub(cs, '\n'); - if (cs->multis != NULL) - mcinvert(p, cs); } - assert(cs->multis == NULL); /* xxx */ - if (nch(p, cs) == 1) { /* optimize singleton sets */ ordinary(p, firstch(p, cs)); freeset(p, cs); @@ -812,7 +788,6 @@ (void)REQUIRE(EATTWO('=', ']'), REG_ECOLLATE); break; default: /* symbol, ordinary character, or range */ -/* xxx revision needed for multichar stuff */ start = p_b_symbol(p); if (SEE('-') && MORE2() && PEEK2() != ']') { /* range */ @@ -932,10 +907,6 @@ CHadd(cs, c); break; } -#if 0 - for (u = cp->multis; *u != '\0'; u += strlen(u) + 1) - MCadd(p, cs, u); -#endif } /* @@ -1059,15 +1030,11 @@ struct parse *p; int ch; { - cat_t *cap = p->g->categories; if ((p->g->cflags®_ICASE) && isalpha((uch)ch) && othercase(ch) != ch) bothcases(p, ch); - else { + else EMIT(OCHAR, (uch)ch); - if (cap[ch] == 0) - cap[ch] = p->g->ncategories++; - } } /* @@ -1233,8 +1200,6 @@ cs->ptr = p->g->setbits + css*((no)/CHAR_BIT); cs->mask = 1 << ((no) % CHAR_BIT); cs->hash = 0; - cs->smultis = 0; - cs->multis = NULL; return(cs); } @@ -1337,193 +1302,6 @@ } /* - - mcadd - add a collating element to a cset - == static void mcadd(struct parse *p, cset *cs, \ - == char *cp); - */ -static void -mcadd(p, cs, cp) -struct parse *p; -cset *cs; -char *cp; -{ - size_t oldend = cs->smultis; - - cs->smultis += strlen(cp) + 1; - if (cs->multis == NULL) - cs->multis = malloc(cs->smultis); - else - cs->multis = reallocf(cs->multis, cs->smultis); - if (cs->multis == NULL) { - SETERROR(REG_ESPACE); - return; - } - - (void) strcpy(cs->multis + oldend - 1, cp); - cs->multis[cs->smultis - 1] = '\0'; -} - -#if used -/* - - mcsub - subtract a collating element from a cset - == static void mcsub(cset *cs, char *cp); - */ -static void -mcsub(cs, cp) -cset *cs; -char *cp; -{ - char *fp = mcfind(cs, cp); - size_t len = strlen(fp); - - assert(fp != NULL); - (void) memmove(fp, fp + len + 1, - cs->smultis - (fp + len + 1 - cs->multis)); - cs->smultis -= len; - - if (cs->smultis == 0) { - free(cs->multis); - cs->multis = NULL; - return; - } - - cs->multis = reallocf(cs->multis, cs->smultis); - assert(cs->multis != NULL); -} - -/* - - mcin - is a collating element in a cset? - == static int mcin(cset *cs, char *cp); - */ -static int -mcin(cs, cp) -cset *cs; -char *cp; -{ - return(mcfind(cs, cp) != NULL); -} - -/* - - mcfind - find a collating element in a cset - == static char *mcfind(cset *cs, char *cp); - */ -static char * -mcfind(cs, cp) -cset *cs; -char *cp; -{ - char *p; - - if (cs->multis == NULL) - return(NULL); - for (p = cs->multis; *p != '\0'; p += strlen(p) + 1) - if (strcmp(cp, p) == 0) - return(p); - return(NULL); -} -#endif - -/* - - mcinvert - invert the list of collating elements in a cset - == static void mcinvert(struct parse *p, cset *cs); - * - * This would have to know the set of possibilities. Implementation - * is deferred. - */ -static void -mcinvert(p, cs) -struct parse *p; -cset *cs; -{ - assert(cs->multis == NULL); /* xxx */ -} - -/* - - mccase - add case counterparts of the list of collating elements in a cset - == static void mccase(struct parse *p, cset *cs); - * - * This would have to know the set of possibilities. Implementation - * is deferred. - */ -static void -mccase(p, cs) -struct parse *p; -cset *cs; -{ - assert(cs->multis == NULL); /* xxx */ -} - -/* - - isinsets - is this character in any sets? - == static int isinsets(struct re_guts *g, int c); - */ -static int /* predicate */ -isinsets(g, c) -struct re_guts *g; -int c; -{ - uch *col; - int i; - int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT; - unsigned uc = (uch)c; - - for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize) - if (col[uc] != 0) - return(1); - return(0); -} - -/* - - samesets - are these two characters in exactly the same sets? - == static int samesets(struct re_guts *g, int c1, int c2); - */ -static int /* predicate */ -samesets(g, c1, c2) -struct re_guts *g; -int c1; -int c2; -{ - uch *col; - int i; - int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT; - unsigned uc1 = (uch)c1; - unsigned uc2 = (uch)c2; - - for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize) - if (col[uc1] != col[uc2]) - return(0); - return(1); -} - -/* - - categorize - sort out character categories - == static void categorize(struct parse *p, struct re_guts *g); - */ -static void -categorize(p, g) -struct parse *p; -struct re_guts *g; -{ - cat_t *cats = g->categories; - int c; - int c2; - cat_t cat; - - /* avoid making error situations worse */ - if (p->error != 0) - return; - - for (c = CHAR_MIN; c <= CHAR_MAX; c++) - if (cats[c] == 0 && isinsets(g, c)) { - cat = g->ncategories++; - cats[c] = cat; - for (c2 = c+1; c2 <= CHAR_MAX; c2++) - if (cats[c2] == 0 && samesets(g, c, c2)) - cats[c2] = cat; - } -} - -/* - dupl - emit a duplicate of a bunch of sops == static sopno dupl(struct parse *p, sopno start, sopno finish); */ @@ -1698,18 +1476,11 @@ char *cp; sopno i; int offset; - int cs, mccs; /* avoid making error situations worse */ if (p->error != 0) return; - /* Find out if we can handle OANYOF or not */ - mccs = 0; - for (cs = 0; cs < g->ncsets; cs++) - if (g->sets[cs].multis != NULL) - mccs = 1; - /* find the longest OCHAR sequence in strip */ newlen = 0; offset = 0; @@ -1729,7 +1500,7 @@ break; case OQUEST_: /* things that must be skipped */ case OCH_: - offset = altoffset(scan, offset, mccs); + offset = altoffset(scan, offset); scan--; do { scan += OPND(s); @@ -1797,11 +1568,6 @@ if (offset > -1) offset++; newlen = 0; - /* And, now, if we found out we can't deal with - * it, make offset = -1. - */ - if (mccs) - offset = -1; break; default: /* Anything here makes it impossible or too hard @@ -1849,16 +1615,15 @@ /* - altoffset - choose biggest offset among multiple choices - == static int altoffset(sop *scan, int offset, int mccs); + == static int altoffset(sop *scan, int offset); * * Compute, recursively if necessary, the largest offset among multiple * re paths. */ static int -altoffset(scan, offset, mccs) +altoffset(scan, offset) sop *scan; int offset; -int mccs; { int largest; int try; @@ -1880,7 +1645,7 @@ break; case OQUEST_: case OCH_: - try = altoffset(scan, try, mccs); + try = altoffset(scan, try); if (try == -1) return -1; scan--; @@ -1897,8 +1662,6 @@ scan++; break; case OANYOF: - if (mccs) - return -1; case OCHAR: case OANY: try++; ==== //depot/projects/gdb/lib/libc/regex/regex2.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)regex2.h 8.4 (Berkeley) 3/20/94 - * $FreeBSD: src/lib/libc/regex/regex2.h,v 1.6 2002/03/22 23:41:56 obrien Exp $ + * $FreeBSD: src/lib/libc/regex/regex2.h,v 1.7 2004/07/11 05:58:31 tjr Exp $ */ /* @@ -113,29 +113,16 @@ * The individual set therefore has both a pointer to the byte vector * and a mask to pick out the relevant bit of each byte. A hash code * simplifies testing whether two sets could be identical. - * - * This will get trickier for multicharacter collating elements. As - * preliminary hooks for dealing with such things, we also carry along - * a string of multi-character elements, and decide the size of the - * vectors at run time. */ typedef struct { uch *ptr; /* -> uch [csetsize] */ uch mask; /* bit within array */ short hash; /* hash code */ - size_t smultis; - char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */ } cset; /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */ #define CHadd(cs, c) ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (uch)(c)) #define CHsub(cs, c) ((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (uch)(c)) #define CHIN(cs, c) ((cs)->ptr[(uch)(c)] & (cs)->mask) -#define MCadd(p, cs, cp) mcadd(p, cs, cp) /* regcomp() internal fns */ -#define MCsub(p, cs, cp) mcsub(p, cs, cp) -#define MCin(p, cs, cp) mcin(p, cs, cp) - -/* stuff for character categories */ -typedef unsigned char cat_t; /* * main compiled-expression structure @@ -158,8 +145,6 @@ # define BAD 04 /* something wrong */ int nbol; /* number of ^ used */ int neol; /* number of $ used */ - int ncategories; /* how many character categories */ - cat_t *categories; /* ->catspace[-CHAR_MIN] */ char *must; /* match must contain this string */ int moffset; /* latest point at which must may be located */ int *charjump; /* Boyer-Moore char jump table */ @@ -168,8 +153,6 @@ size_t nsub; /* copy of re_nsub */ int backrefs; /* does it use back references? */ sopno nplus; /* how deep does it nest +s? */ - /* catspace must be last */ - cat_t catspace[1]; /* actually [NC] */ }; /* misc utilities */ ==== //depot/projects/gdb/share/man/man9/sx.9#5 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sx.9,v 1.28 2004/06/16 08:33:57 ru Exp $ +.\" $FreeBSD: src/share/man/man9/sx.9,v 1.29 2004/07/11 16:08:25 darrenr Exp $ .\" .Dd August 14, 2001 .Dt SX 9 @@ -42,6 +42,7 @@ .Nm sx_try_upgrade , .Nm sx_downgrade , .Nm sx_assert , +.Nm sx_unlock , .Nm SX_SYSINIT .Nd kernel shared/exclusive lock .Sh SYNOPSIS @@ -68,13 +69,16 @@ .Fn sx_try_upgrade "struct sx *sx" .Ft void .Fn sx_downgrade "struct sx *sx" -.Pp -.Cd "options INVARIANTS" -.Cd "options INVARIANT_SUPPORT" .Ft void .Fn sx_assert "struct sx *sx" "int what" -.In sys/kernel.h +.\" +.Ss sx utility macros +.Fn sx_unlock "struct sx *sx" .Fn SX_SYSINIT "name" "struct sx *sx" "const char *description" +.\" +.Ss Kernel options +.Cd "options INVARIANTS" +.Cd "options INVARIANT_SUPPORT" .Sh DESCRIPTION Shared/exclusive locks are used to protect data that are read far more often than they are written. @@ -98,13 +102,17 @@ or .Fn sx_try_slock and -.Fn sx_sunlock . +.Fn sx_sunlock +or +.Fn sx_unlock . Threads acquire and release an exclusive lock by calling .Fn sx_xlock or .Fn sx_try_xlock and -.Fn sx_xunlock . +.Fn sx_xunlock +or +.Fn sx_unlock . A thread can attempt to upgrade a currently held shared lock to an exclusive lock by calling .Fn sx_try_upgrade . @@ -158,6 +166,15 @@ by the first argument. .El .Pp +For ease of programming, +.Fn sx_unlock +is provided as a macro frontend to the respective functions, +.Fn sx_sunlock +and +.Fn sx_xunlock . +Algorithms that are aware of what state the lock is in should use either +of the two specific functions for a minor performance benefit. +.Pp The .Fn SX_SYSINIT macro is used to generate a call to the ==== //depot/projects/gdb/sys/amd64/isa/clock.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.212 2004/07/10 22:42:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.213 2004/07/11 18:07:55 marcel Exp $"); /* * Routines to handle clock hardware. @@ -53,8 +53,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -293,8 +293,18 @@ * takes about 1.5 usec for each of the i/o's in getit(). The loop * takes about 6 usec on a 486/33 and 13 usec on a 386/20. The * multiplications and divisions to scale the count take a while). + * + * However, if ddb is active then use a fake counter since reading + * the i8254 counter involves acquiring a lock. ddb must not go + * locking for many reasons, but it calls here for at least atkbd + * input. */ - prev_tick = getit(); +#ifdef KDB + if (kdb_active) + prev_tick = 1; + else +#endif + prev_tick = getit(); n -= 0; /* XXX actually guess no initial overhead */ /* * Calculate (n * (timer_freq / 1e6)) without using floating point @@ -321,7 +331,15 @@ / 1000000; while (ticks_left > 0) { - tick = getit(); +#ifdef KDB + if (kdb_active) { + inb(0x84); + tick = prev_tick - 1; + if (tick <= 0) + tick = timer0_max_count; + } else +#endif + tick = getit(); #ifdef DELAYDEBUG ++getit_calls; #endif @@ -366,17 +384,10 @@ splx(x); return (-1); /* XXX Should be EBUSY, but nobody cares anyway. */ } -#ifdef KDB - if (!kdb_active) -#endif - mtx_lock_spin(&clock_lock); + mtx_lock_spin(&clock_lock); outb(TIMER_CNTR2, pitch); outb(TIMER_CNTR2, (pitch>>8)); -#ifdef KDB - if (!kdb_active) -#endif - mtx_unlock_spin(&clock_lock); - + mtx_unlock_spin(&clock_lock); if (!beeping) { /* enable counter2 output to speaker */ outb(IO_PPI, inb(IO_PPI) | 3); ==== //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_fil.c#5 (text+ko) ==== @@ -131,7 +131,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.42.2.34 2001/07/23 13:49:57 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.46 2004/06/22 02:44:06 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.47 2004/07/11 10:13:05 darrenr Exp $"; #endif extern struct protosw inetsw[]; @@ -168,7 +168,7 @@ # endif # ifdef __sgi extern int tcp_mtudisc; -extern kmutex_t ipf_rw; +extern kmutex_t ipf_rw; extern KRWLOCK_T ipf_mutex; # endif #else @@ -206,8 +206,6 @@ defined(_KERNEL) # include const struct cdevsw ipl_cdevsw = { - .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, iplopen, iplclose, iplread, nowrite, iplioctl, nostop, notty, nopoll, nommap, }; @@ -229,8 +227,9 @@ }; #endif /* _BSDI_VERSION >= 199510 && _KERNEL */ -#if defined(__NetBSD__) || defined(__OpenBSD__) || \ - (_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 500011) +#if defined(__NetBSD__) || defined(__OpenBSD__) || \ + (_BSDI_VERSION >= 199701) || \ + ((__FreeBSD_version >= 500011) && defined(_KERNEL)) # include # if defined(NETBSD_PF) # include @@ -328,7 +327,7 @@ fr_check_wrapper6(void *arg, struct mbuf **mp, struct ifnet *ifp, int dir) { return (fr_check(mtod(*mp, struct ip *), sizeof(struct ip6_hdr), - ifp, (dir == PFIL_OUT), mp)); + ifp, (dir == PFIL_OUT), mp)); } # endif #endif /* __FreeBSD_version >= 501108 */ @@ -535,7 +534,7 @@ ((__NetBSD_Version__ >= 104200000) || (__FreeBSD_version >= 500011)) int error = 0; # if (__NetBSD_Version__ >= 105150000) || (__FreeBSD_version >= 501108) - struct pfil_head *ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET); + struct pfil_head *ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET); # ifdef USE_INET6 struct pfil_head *ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6); # endif @@ -2232,8 +2231,8 @@ int fd; # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) for (ifa = ifneta; ifa && (ifp = *ifa); ifa++) { ifp->if_output = write_output; sprintf(fname, "/tmp/%s", ifp->if_xname); ==== //depot/projects/gdb/sys/dev/cx/if_cx.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.25 2004/06/28 16:17:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.26 2004/07/11 15:18:37 phk Exp $"); #include @@ -160,14 +160,11 @@ cx_dma_mem_t dmamem; struct tty *tty; struct callout_handle dcd_timeout_handle; - unsigned dtrwait; - unsigned dtroff; unsigned callout; unsigned lock; int open_dev; int cd; int running; - struct callout_handle dtr_timeout_handle; #ifdef NETGRAPH char nodename [NG_NODELEN+1]; hook_p hook; @@ -217,7 +214,6 @@ static void cx_oproc (struct tty *tp); static int cx_param (struct tty *tp, struct termios *t); static void cx_stop (struct tty *tp, int flag); -static void cx_dtrwakeup (void *a); static void cx_receive (cx_chan_t *c, char *data, int len); static void cx_transmit (cx_chan_t *c, void *attachment, int len); static void cx_error (cx_chan_t *c, int data); @@ -817,7 +813,6 @@ sprintf (d->name, "cx%d.%d", b->num, c->num); d->board = b; d->chan = c; - d->dtrwait = 3 * hz; /* Default DTR off timeout is 3 seconds. */ d->open_dev = 0; c->sys = d; @@ -940,8 +935,6 @@ if (!d || d->chan->type == T_NONE) continue; - if (d->dtr_timeout_handle.callout) - untimeout (cx_dtrwakeup, d, d->dtr_timeout_handle); if (d->dcd_timeout_handle.callout) untimeout (cx_carrier, c, d->dcd_timeout_handle); } @@ -1518,12 +1511,9 @@ dev->si_tty = d->tty; d->tty->t_dev = dev; again: - if (d->dtroff) { - error = tsleep (&d->dtrwait, TTIPRI | PCATCH, "cxdtr", 0); - if (error) - return error; - goto again; - } + error = ttydtrwaitsleep(d->tty); + if (error) + return error; if ((d->tty->t_state & TS_ISOPEN) && (d->tty->t_state & TS_XCLUDE) && #if __FreeBSD_version >= 500000 @@ -1608,11 +1598,7 @@ splhigh (); cx_set_dtr (d->chan, 0); cx_set_rts (d->chan, 0); - if (d->dtrwait) { - d->dtr_timeout_handle = - timeout (cx_dtrwakeup, d, d->dtrwait); - d->dtroff = 1; - } + ttydtrwaitstart(d->tty); spl0 (); } return error; @@ -1652,11 +1638,7 @@ if ((d->tty->t_cflag & HUPCL) || ! (d->tty->t_state & TS_ISOPEN)) { cx_set_dtr (d->chan, 0); cx_set_rts (d->chan, 0); - if (d->dtrwait) { - d->dtr_timeout_handle = - timeout (cx_dtrwakeup, d, d->dtrwait); - d->dtroff = 1; - } + ttydtrwaitstart(d->tty); } ttyclose (d->tty); splx (s); @@ -2139,48 +2121,11 @@ *(int*)data = cx_modem_status (d); return 0; -#ifdef TIOCMSDTRWAIT - case TIOCMSDTRWAIT: - CX_DEBUG2 (d, ("ioctl: tiocmsdtrwait\n")); - /* Only for superuser! */ -#if __FreeBSD_version < 500000 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 11 18:20:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EBF316A4D3; Sun, 11 Jul 2004 18:20:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED10016A4CE for ; Sun, 11 Jul 2004 18:20:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5CAD43D39 for ; Sun, 11 Jul 2004 18:20:54 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6BIKs60081522 for ; Sun, 11 Jul 2004 18:20:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6BIKsPr081519 for perforce@freebsd.org; Sun, 11 Jul 2004 18:20:54 GMT (envelope-from marcel@freebsd.org) Date: Sun, 11 Jul 2004 18:20:54 GMT Message-Id: <200407111820.i6BIKsPr081519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 18:20:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=57098 Change 57098 by marcel@marcel_nfs on 2004/07/11 18:20:28 Diff reduction. I included for reasons that have probably gone over time. I didn't merge this into CVS yesterday and nothing broke, so remove it here too. Affected files ... .. //depot/projects/gdb/sys/fs/devfs/devfs_devs.c#6 edit .. //depot/projects/gdb/sys/vm/uma_core.c#11 edit Differences ... ==== //depot/projects/gdb/sys/fs/devfs/devfs_devs.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/gdb/sys/vm/uma_core.c#11 (text+ko) ==== @@ -58,7 +58,6 @@ #include "opt_param.h" #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jul 11 18:39:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A43D416A4D0; Sun, 11 Jul 2004 18:39:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D2D416A4CE for ; Sun, 11 Jul 2004 18:39:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 728FD43D2D for ; Sun, 11 Jul 2004 18:39:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6BIdJuv082085 for ; Sun, 11 Jul 2004 18:39:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6BIdIPh082082 for perforce@freebsd.org; Sun, 11 Jul 2004 18:39:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Jul 2004 18:39:18 GMT Message-Id: <200407111839.i6BIdIPh082082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 18:39:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=57102 Change 57102 by rwatson@rwatson_tislabs on 2004/07/11 18:38:21 Integrate netperf_socket: - KDB changes - Add additional soreceive() comments. - Break out soreceive_rcvoob() from soreceive(). Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/netperf_socket/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/amd64-gdbstub.c#2 delete .. //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/support.S#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/netperf_socket/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/frame.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#16 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#12 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#27 integrate .. //depot/projects/netperf_socket/sys/conf/files#38 integrate .. //depot/projects/netperf_socket/sys/conf/files.alpha#6 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#11 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#20 integrate .. //depot/projects/netperf_socket/sys/conf/files.ia64#5 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#12 integrate .. //depot/projects/netperf_socket/sys/conf/files.powerpc#4 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#6 integrate .. //depot/projects/netperf_socket/sys/conf/options#20 integrate .. //depot/projects/netperf_socket/sys/conf/options.alpha#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#5 integrate .. //depot/projects/netperf_socket/sys/ddb/db_access.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_break.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_command.c#3 integrate .. //depot/projects/netperf_socket/sys/ddb/db_elf.c#3 delete .. //depot/projects/netperf_socket/sys/ddb/db_kld.c#2 delete .. //depot/projects/netperf_socket/sys/ddb/db_main.c#1 branch .. //depot/projects/netperf_socket/sys/ddb/db_output.c#3 integrate .. //depot/projects/netperf_socket/sys/ddb/db_print.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_ps.c#4 integrate .. //depot/projects/netperf_socket/sys/ddb/db_run.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_sysctl.c#2 delete .. //depot/projects/netperf_socket/sys/ddb/db_thread.c#1 branch .. //depot/projects/netperf_socket/sys/ddb/db_trap.c#2 delete .. //depot/projects/netperf_socket/sys/ddb/db_variables.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_variables.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/ddb.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/netperf_socket/sys/doc/Doxyfile#1 branch .. //depot/projects/netperf_socket/sys/doc/Makefile#1 branch .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/netperf_socket/sys/i386/i386/db_interface.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/i386-gdbstub.c#2 delete .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/i386/trap.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/db_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/frame.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#6 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/SKI#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/ia64-gdbstub.c#2 delete .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/unwind.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/db_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/unwind.h#2 integrate .. //depot/projects/netperf_socket/sys/kern/device_if.m#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#30 integrate .. //depot/projects/netperf_socket/sys/modules/uart/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#6 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#15 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/db_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/psycho.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#18 integrate .. //depot/projects/netperf_socket/sys/sys/sx.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#10 integrate .. //depot/projects/netperf_socket/sys/tools/makeobjops.awk#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#10 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -25,10 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $"); - -#include "opt_ddb.h" -#include "opt_dev_sc.h" +__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.11 2004/07/10 22:29:40 marcel Exp $"); #include #include @@ -49,18 +46,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void api_up1000_init(void); static void api_up1000_cons_init(void); @@ -85,40 +70,15 @@ irongate_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/netperf_socket/sys/alpha/alpha/db_disasm.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.9 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.10 2004/07/10 23:47:18 marcel Exp $"); #include #include @@ -813,26 +813,9 @@ * (optional) alternate format. Return address of start of * next instruction. */ -int alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t); -db_addr_t -db_disasm(loc, altfmt) - db_addr_t loc; - boolean_t altfmt; -{ - alpha_instruction inst; - - inst.bits = db_get_value(loc, 4, 0); - - loc += alpha_print_instruction(loc, inst, altfmt); - return (loc); -} - -int -alpha_print_instruction(iadr, i, showregs) - db_addr_t iadr; - alpha_instruction i; - boolean_t showregs; +static int +alpha_print_instr(db_addr_t iadr, alpha_instruction i, boolean_t showregs) { const char *opcode; int ireg; @@ -1038,7 +1021,7 @@ if (i.mem_format.opcode == op_ldah) signed_immediate <<= 16; db_printf(" <0x%lx>", signed_immediate + - db_register_value(DDB_REGS, i.mem_format.rs)); + db_register_value(i.mem_format.rs)); } break; case op_br: @@ -1084,10 +1067,23 @@ db_printf(","); db_printf("%s=0x%lx", name_of_register[regnum[ireg]], - db_register_value(DDB_REGS, regnum[ireg])); + db_register_value(regnum[ireg])); } db_printf(">"); } db_printf("\n"); return (sizeof(alpha_instruction)); } + +db_addr_t +db_disasm(loc, altfmt) + db_addr_t loc; + boolean_t altfmt; +{ + alpha_instruction inst; + + inst.bits = db_get_value(loc, 4, 0); + + loc += alpha_print_instr(loc, inst, altfmt); + return (loc); +} ==== //depot/projects/netperf_socket/sys/alpha/alpha/db_interface.c#2 (text+ko) ==== @@ -47,17 +47,15 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.28 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.29 2004/07/10 23:47:18 marcel Exp $"); #include -#include -#include #include +#include +#include #include -#include -#include -#include #include +#include #include #include @@ -73,209 +71,104 @@ #include #include #include -#include -static jmp_buf *db_nofault = 0; -extern jmp_buf db_jmpbuf; +static db_varfcn_t db_frame; -extern void gdb_handle_exception(db_regs_t *, int, int); - -#if 0 -extern char *trap_type[]; -extern int trap_types; -#endif - -int db_active; - -void ddbprinttrap(unsigned long, unsigned long, unsigned long, - unsigned long); - struct db_variable db_regs[] = { - { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL }, - { "t0", &ddb_regs.tf_regs[FRAME_T0], FCN_NULL }, - { "t1", &ddb_regs.tf_regs[FRAME_T1], FCN_NULL }, - { "t2", &ddb_regs.tf_regs[FRAME_T2], FCN_NULL }, - { "t3", &ddb_regs.tf_regs[FRAME_T3], FCN_NULL }, - { "t4", &ddb_regs.tf_regs[FRAME_T4], FCN_NULL }, - { "t5", &ddb_regs.tf_regs[FRAME_T5], FCN_NULL }, - { "t6", &ddb_regs.tf_regs[FRAME_T6], FCN_NULL }, - { "t7", &ddb_regs.tf_regs[FRAME_T7], FCN_NULL }, - { "s0", &ddb_regs.tf_regs[FRAME_S0], FCN_NULL }, - { "s1", &ddb_regs.tf_regs[FRAME_S1], FCN_NULL }, - { "s2", &ddb_regs.tf_regs[FRAME_S2], FCN_NULL }, - { "s3", &ddb_regs.tf_regs[FRAME_S3], FCN_NULL }, - { "s4", &ddb_regs.tf_regs[FRAME_S4], FCN_NULL }, - { "s5", &ddb_regs.tf_regs[FRAME_S5], FCN_NULL }, - { "s6", &ddb_regs.tf_regs[FRAME_S6], FCN_NULL }, - { "a0", &ddb_regs.tf_regs[FRAME_A0], FCN_NULL }, - { "a1", &ddb_regs.tf_regs[FRAME_A1], FCN_NULL }, - { "a2", &ddb_regs.tf_regs[FRAME_A2], FCN_NULL }, - { "a3", &ddb_regs.tf_regs[FRAME_A3], FCN_NULL }, - { "a4", &ddb_regs.tf_regs[FRAME_A4], FCN_NULL }, - { "a5", &ddb_regs.tf_regs[FRAME_A5], FCN_NULL }, - { "t8", &ddb_regs.tf_regs[FRAME_T8], FCN_NULL }, - { "t9", &ddb_regs.tf_regs[FRAME_T9], FCN_NULL }, - { "t10", &ddb_regs.tf_regs[FRAME_T10], FCN_NULL }, - { "t11", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL }, - { "ra", &ddb_regs.tf_regs[FRAME_RA], FCN_NULL }, - { "t12", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL }, - { "at", &ddb_regs.tf_regs[FRAME_AT], FCN_NULL }, - { "gp", &ddb_regs.tf_regs[FRAME_GP], FCN_NULL }, - { "sp", &ddb_regs.tf_regs[FRAME_SP], FCN_NULL }, - { "pc", &ddb_regs.tf_regs[FRAME_PC], FCN_NULL }, - { "ps", &ddb_regs.tf_regs[FRAME_PS], FCN_NULL }, - { "ai", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL }, - { "pv", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL }, + { "v0", (db_expr_t *)FRAME_V0, db_frame }, + { "t0", (db_expr_t *)FRAME_T0, db_frame }, + { "t1", (db_expr_t *)FRAME_T1, db_frame }, + { "t2", (db_expr_t *)FRAME_T2, db_frame }, + { "t3", (db_expr_t *)FRAME_T3, db_frame }, + { "t4", (db_expr_t *)FRAME_T4, db_frame }, + { "t5", (db_expr_t *)FRAME_T5, db_frame }, + { "t6", (db_expr_t *)FRAME_T6, db_frame }, + { "t7", (db_expr_t *)FRAME_T7, db_frame }, + { "s0", (db_expr_t *)FRAME_S0, db_frame }, + { "s1", (db_expr_t *)FRAME_S1, db_frame }, + { "s2", (db_expr_t *)FRAME_S2, db_frame }, + { "s3", (db_expr_t *)FRAME_S3, db_frame }, + { "s4", (db_expr_t *)FRAME_S4, db_frame }, + { "s5", (db_expr_t *)FRAME_S5, db_frame }, + { "s6", (db_expr_t *)FRAME_S6, db_frame }, + { "a0", (db_expr_t *)FRAME_A0, db_frame }, + { "a1", (db_expr_t *)FRAME_A1, db_frame }, + { "a2", (db_expr_t *)FRAME_A2, db_frame }, + { "a3", (db_expr_t *)FRAME_A3, db_frame }, + { "a4", (db_expr_t *)FRAME_A4, db_frame }, + { "a5", (db_expr_t *)FRAME_A5, db_frame }, + { "t8", (db_expr_t *)FRAME_T8, db_frame }, + { "t9", (db_expr_t *)FRAME_T9, db_frame }, + { "t10", (db_expr_t *)FRAME_T10, db_frame }, + { "t11", (db_expr_t *)FRAME_T11, db_frame }, + { "ra", (db_expr_t *)FRAME_RA, db_frame }, + { "t12", (db_expr_t *)FRAME_T12, db_frame }, + { "at", (db_expr_t *)FRAME_AT, db_frame }, + { "gp", (db_expr_t *)FRAME_GP, db_frame }, + { "sp", (db_expr_t *)FRAME_SP, db_frame }, + { "pc", (db_expr_t *)FRAME_PC, db_frame }, + { "ps", (db_expr_t *)FRAME_PS, db_frame }, + { "ai", (db_expr_t *)FRAME_T11, db_frame }, + { "pv", (db_expr_t *)FRAME_T12, db_frame }, }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); -/* - * Print trap reason. - */ -void -ddbprinttrap(a0, a1, a2, entry) - unsigned long a0, a1, a2, entry; +static int +db_frame(struct db_variable *vp, db_expr_t *valuep, int op) { - /* XXX Implement. */ - - printf("ddbprinttrap(0x%lx, 0x%lx, 0x%lx, 0x%lx)\n", a0, a1, a2, - entry); + if (kdb_frame == NULL) + return (0); + if (op == DB_VAR_GET) + *valuep = kdb_frame->tf_regs[(uintptr_t)vp->valuep]; + else + kdb_frame->tf_regs[(uintptr_t)vp->valuep] = *valuep; + return (1); } /* - * ddb_trap - field a kernel trap + * Read bytes from kernel address space for debugger. */ int -kdb_trap(a0, a1, a2, entry, regs) - unsigned long a0, a1, a2, entry; - db_regs_t *regs; +db_read_bytes(vm_offset_t addr, size_t size, char *data) { - int ddb_mode = !(boothowto & RB_GDB); - register_t s; + jmp_buf jb; + void *prev_jb; + char *src; + int ret; - /* - * Don't bother checking for usermode, since a benign entry - * by the kernel (call to Debugger() or a breakpoint) has - * already checked for usermode. If neither of those - * conditions exist, something Bad has happened. - */ - - if (entry != ALPHA_KENTRY_IF || - (a0 != ALPHA_IF_CODE_BUGCHK && a0 != ALPHA_IF_CODE_BPT - && a0 != ALPHA_IF_CODE_GENTRAP)) { -#if 0 - if (ddb_mode) { - db_printf("ddbprinttrap from 0x%lx\n", /* XXX */ - regs->tf_regs[FRAME_PC]); - ddbprinttrap(a0, a1, a2, entry); - /* - * Tell caller "We did NOT handle the trap." - * Caller should panic, or whatever. - */ - return (0); - } -#endif - if (db_nofault) { - jmp_buf *no_fault = db_nofault; - db_nofault = 0; - longjmp(*no_fault, 1); - } + prev_jb = kdb_jmpbuf(jb); + ret = setjmp(jb); + if (ret == 0) { + src = (char *)addr; + while (size-- > 0) + *data++ = *src++; } - - /* - * XXX Should switch to DDB's own stack, here. - */ - - ddb_regs = *regs; - - s = intr_disable(); - -#ifdef SMP -#ifdef DIAGNOSTIC - db_printf("stopping %x\n", PCPU_GET(other_cpus)); -#endif - stop_cpus(PCPU_GET(other_cpus)); -#ifdef DIAGNOSTIC - db_printf("stopped_cpus=%x\n", stopped_cpus); -#endif -#endif - - db_active++; - - if (ddb_mode) { - cndbctl(TRUE); /* DDB active, unblank video */ - db_trap(entry, a0); /* Where the work happens */ - cndbctl(FALSE); /* DDB inactive */ - } else - gdb_handle_exception(&ddb_regs, entry, a0); - - db_active--; - -#ifdef SMP - restart_cpus(stopped_cpus); -#endif - - intr_restore(s); - - *regs = ddb_regs; - - /* - * Tell caller "We HAVE handled the trap." - */ - return (1); + (void)kdb_jmpbuf(prev_jb); + return (ret); } /* - * Read bytes from kernel address space for debugger. - */ -void -db_read_bytes(addr, size, data) - vm_offset_t addr; - register size_t size; - register char *data; -{ - register char *src; - - db_nofault = &db_jmpbuf; - - src = (char *)addr; - while (size-- > 0) - *data++ = *src++; - - db_nofault = 0; -} - -/* * Write bytes to kernel address space for debugger. */ -void -db_write_bytes(addr, size, data) - vm_offset_t addr; - register size_t size; - register char *data; +int +db_write_bytes(vm_offset_t addr, size_t size, char *data) { - register char *dst; + jmp_buf jb; + void *prev_jb; + char *dst; + int ret; - db_nofault = &db_jmpbuf; - - dst = (char *)addr; - while (size-- > 0) - *dst++ = *data++; - alpha_pal_imb(); - - db_nofault = 0; -} - -void -Debugger(const char* msg) -{ - u_int saveintr; - - printf("%s\n", msg); - saveintr = alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH); - __asm("call_pal 0x81"); /* XXX bugchk */ - alpha_pal_swpipl(saveintr); + prev_jb = kdb_jmpbuf(jb); + ret = setjmp(jb); + if (ret == 0) { + dst = (char *)addr; + while (size-- > 0) + *dst++ = *data++; + alpha_pal_imb(); + } + (void)kdb_jmpbuf(prev_jb); + return (ret); } /* @@ -338,9 +231,7 @@ }; u_long -db_register_value(regs, regno) - db_regs_t *regs; - int regno; +db_register_value(int regno) { if (regno > 31 || regno < 0) { @@ -351,7 +242,7 @@ if (regno == 31) return (0); - return (regs->tf_regs[reg_to_frame[regno]]); + return (kdb_frame->tf_regs[reg_to_frame[regno]]); } /* @@ -446,19 +337,6 @@ return (FALSE); } -#if 0 -boolean_t -db_inst_spill(ins, regn) - int ins, regn; -{ - alpha_instruction insn; - - insn.bits = ins; - return ((insn.mem_format.opcode == op_stq) && - (insn.mem_format.rd == regn)); -} -#endif - boolean_t db_inst_load(ins) int ins; @@ -520,10 +398,7 @@ } db_addr_t -db_branch_taken(ins, pc, regs) - int ins; - db_addr_t pc; - db_regs_t *regs; +db_branch_taken(int ins, db_addr_t pc) { alpha_instruction insn; db_addr_t newpc; @@ -534,7 +409,7 @@ * Jump format: target PC is (contents of instruction's "RB") & ~3. */ case op_j: - newpc = db_register_value(regs, insn.jump_format.rs) & ~3; + newpc = db_register_value(insn.jump_format.rs) & ~3; break; /* ==== //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#2 (text+ko) ==== @@ -42,10 +42,11 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.18 2004/01/04 23:30:47 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.19 2004/07/10 23:47:18 marcel Exp $"); #include #include +#include #include #include #include @@ -60,11 +61,6 @@ #include #include -struct trace_request { - register_t ksp; - register_t pc; -}; - /* * Information about the `standard' Alpha function prologue. */ @@ -186,13 +182,15 @@ } static void -decode_syscall(int number, struct proc *p) +decode_syscall(int number, struct thread *td) { + struct proc *p; c_db_sym_t sym; db_expr_t diff; sy_call_t *f; const char *symname; + p = (td != NULL) ? td->td_proc : NULL; db_printf(" (%d", number); if (p != NULL && 0 <= number && number < p->p_sysent->sv_size) { f = p->p_sysent->sv_table[number].sy_call; @@ -205,99 +203,34 @@ db_printf(")"); } -void -db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif) +static int +db_backtrace(struct thread *td, db_addr_t frame, db_addr_t pc, int count) { - db_addr_t callpc = 0, frame = 0, symval; struct prologue_info pi; + struct trapframe *tf; + const char *symname; + c_db_sym_t sym; db_expr_t diff; - c_db_sym_t sym; + db_addr_t symval; + u_long last_ipl, tfps; int i; - u_long tfps; - const char *symname; - struct pcb *pcbp; - struct trapframe *tf = NULL; - boolean_t ra_from_tf = FALSE; - boolean_t ra_from_pcb; - u_long last_ipl = ~0L; - struct proc *p = NULL; - struct thread *td = NULL; - boolean_t have_trapframe = FALSE; - pid_t pid; if (count == -1) - count = 65535; + count = 1024; - if (!have_addr) { - td = curthread; - p = td->td_proc; - addr = DDB_REGS->tf_regs[FRAME_SP] - FRAME_SIZE * 8; - tf = (struct trapframe *)addr; - have_trapframe = 1; - } else if (addr < KERNBASE) { - pid = (addr % 16) + ((addr >> 4) % 16) * 10 + - ((addr >> 8) % 16) * 100 + ((addr >> 12) % 16) * 1000 + - ((addr >> 16) % 16) * 10000; - /* - * The pcb for curproc is not valid at this point, - * so fall back to the default case. - */ - if (pid == curthread->td_proc->p_pid) { - td = curthread; - p = td->td_proc; - addr = DDB_REGS->tf_regs[FRAME_SP] - FRAME_SIZE * 8; - tf = (struct trapframe *)addr; - have_trapframe = 1; - } else { - /* sx_slock(&allproc_lock); */ - LIST_FOREACH(p, &allproc, p_list) { - if (p->p_pid == pid) - break; - } - /* sx_sunlock(&allproc_lock); */ - if (p == NULL) { - db_printf("pid %d not found\n", pid); - return; - } - if ((p->p_sflag & PS_INMEM) == 0) { - db_printf("pid %d swapped out\n", pid); - return; - } - pcbp = FIRST_THREAD_IN_PROC(p)->td_pcb; /* XXXKSE */ - addr = (db_expr_t)pcbp->pcb_hw.apcb_ksp; - callpc = pcbp->pcb_context[7]; - frame = addr; - } - } else { - struct trace_request *tr; - - tr = (struct trace_request *)addr; - if (tr->ksp < KERNBASE || tr->pc < KERNBASE) { - db_printf("alpha trace requires known PC =eject=\n"); - return; - } - callpc = tr->pc; - addr = tr->ksp; - frame = addr; - } - + last_ipl = ~0L; + tf = NULL; while (count--) { - if (have_trapframe) { - frame = (db_addr_t)tf + FRAME_SIZE * 8; - callpc = tf->tf_regs[FRAME_PC]; - ra_from_tf = TRUE; - have_trapframe = 0; - } - sym = db_search_symbol(callpc, DB_STGY_ANY, &diff); + sym = db_search_symbol(pc, DB_STGY_ANY, &diff); if (sym == DB_SYM_NULL) - break; + return (ENOENT); db_symbol_values(sym, &symname, (db_expr_t *)&symval); - if (callpc < symval) { - db_printf("symbol botch: callpc 0x%lx < " - "func 0x%lx (%s)\n", callpc, symval, symname); - return; + if (pc < symval) { + db_printf("symbol botch: pc 0x%lx < " + "func 0x%lx (%s)\n", pc, symval, symname); + return (0); } /* @@ -328,7 +261,7 @@ * debugger (for serious debugging). */ db_printf("%s() at ", symname); - db_printsym(callpc, DB_STGY_PROC); + db_printsym(pc, DB_STGY_PROC); db_printf("\n"); /* @@ -337,7 +270,6 @@ */ if (sym_is_trapsymbol(symval)) { tf = (struct trapframe *)frame; - for (i = 0; special_symbols[i].ss_val != 0; ++i) if (symval == special_symbols[i].ss_val) db_printf("--- %s", @@ -345,7 +277,7 @@ tfps = tf->tf_regs[FRAME_PS]; if (symval == (uintptr_t)&XentSys) - decode_syscall(tf->tf_regs[FRAME_V0], p); + decode_syscall(tf->tf_regs[FRAME_V0], td); if ((tfps & ALPHA_PSL_IPL_MASK) != last_ipl) { last_ipl = tfps & ALPHA_PSL_IPL_MASK; if (symval != (uintptr_t)&XentSys) @@ -356,7 +288,8 @@ db_printf("--- user mode ---\n"); break; /* Terminate search. */ } - have_trapframe = 1; + frame = (db_addr_t)(tf + 1); + pc = tf->tf_regs[FRAME_PC]; continue; } @@ -366,8 +299,8 @@ * * XXX How does this interact w/ alloca()?! */ - if (decode_prologue(callpc, symval, &pi)) - return; + if (decode_prologue(pc, symval, &pi)) + return (0); if ((pi.pi_regmask & (1 << 26)) == 0) { /* * No saved RA found. We might have RA from @@ -375,37 +308,56 @@ * in a leaf call). If not, we've found the * root of the call graph. */ - if (ra_from_tf) - callpc = tf->tf_regs[FRAME_RA]; + if (tf) + pc = tf->tf_regs[FRAME_RA]; else { db_printf("--- root of call graph ---\n"); break; } } else - callpc = *(u_long *)(frame + pi.pi_reg_offset[26]); - ra_from_tf = ra_from_pcb = FALSE; -#if 0 - /* - * The call was actually made at RA - 4; the PC is - * updated before being stored in RA. - */ - callpc -= 4; -#endif + pc = *(u_long *)(frame + pi.pi_reg_offset[26]); frame += pi.pi_frame_size; + tf = NULL; + } + + return (0); +} + +void +db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, + char *modif) +{ + struct thread *td; + + td = (have_addr) ? kdb_thr_lookup(addr) : kdb_thread; + if (td == NULL) { + db_printf("Thread %d not found\n", (int)addr); + return; } + db_trace_thread(td, count); } void -db_print_backtrace(void) +db_trace_self(void) { - struct trace_request tr; + register_t pc, sp; __asm __volatile( " mov $30,%0 \n" " lda %1,1f \n" "1:\n" - : "=r" (tr.ksp), "=r" (tr.pc)); - db_stack_trace_cmd((db_addr_t)&tr, 1, -1, NULL); + : "=r" (sp), "=r" (pc)); + db_backtrace(curthread, sp, pc, -1); +} + +int +db_trace_thread(struct thread *thr, int count) +{ + struct pcb *ctx; + + ctx = kdb_thr_ctx(thr); + return (db_backtrace(thr, ctx->pcb_hw.apcb_ksp, ctx->pcb_context[7], + count)); } int ==== //depot/projects/netperf_socket/sys/alpha/alpha/dec_1000a.c#2 (text+ko) ==== @@ -72,11 +72,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.17 2003/08/25 03:43:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.18 2004/07/10 22:29:40 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -94,18 +91,6 @@ #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void dec_1000a_init(int); static void dec_1000a_cons_init(void); @@ -185,45 +170,15 @@ apecs_init(); } -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 11 23:27:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1A5216A4D0; Sun, 11 Jul 2004 23:27:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CAB1116A4CE for ; Sun, 11 Jul 2004 23:27:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C094343D45 for ; Sun, 11 Jul 2004 23:27:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6BNRGuk090871 for ; Sun, 11 Jul 2004 23:27:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6BNRGio090868 for perforce@freebsd.org; Sun, 11 Jul 2004 23:27:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Jul 2004 23:27:16 GMT Message-Id: <200407112327.i6BNRGio090868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2004 23:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=57125 Change 57125 by rwatson@rwatson_tislabs on 2004/07/11 23:26:54 Integrate netperf_socket to loop back soreceive() locking changes committed to CVS from rwatson_netperf. Affected files ... .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#31 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#8 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/kern_conf.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.153 2004/06/22 20:22:24 le Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.154 2004/07/11 19:26:43 phk Exp $"); #include #include @@ -44,7 +44,7 @@ #include #include -static MALLOC_DEFINE(M_DEVT, "struct cdev *", "struct cdev *storage"); +static MALLOC_DEFINE(M_DEVT, "cdev", "cdev storage"); /* Built at compile time from sys/conf/majors */ extern unsigned char reserved_majors[256]; @@ -77,7 +77,7 @@ devlock(void) { if (!mtx_initialized(&devmtx)) - mtx_init(&devmtx, "struct cdev *", NULL, MTX_DEF); + mtx_init(&devmtx, "cdev", NULL, MTX_DEF); mtx_lock(&devmtx); } ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#31 (text+ko) ==== @@ -1,4 +1,6 @@ /* + * Copyright (c) 2004 The FreeBSD Foundation + * Copyright (c) 2004 Robert Watson * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. * @@ -30,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.199 2004/07/11 18:29:47 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.201 2004/07/11 23:13:14 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -895,6 +897,42 @@ } /* + * Following replacement or removal of the first mbuf on the first mbuf chain + * of a socket buffer, push necessary state changes back into the socket + * buffer so that other consumers see the values consistently. 'nextrecord' + * is the callers locally stored value of the original value of + * sb->sb_mb->m_nextpkt which must be restored when the lead mbuf changes. + * NOTE: 'nextrecord' may be NULL. + */ +static __inline void +sockbuf_pushsync(struct sockbuf *sb, struct mbuf *nextrecord) +{ + + SOCKBUF_LOCK_ASSERT(sb); + /* + * First, update for the new value of nextrecord. If necessary, make + * it the first record. + */ + if (sb->sb_mb != NULL) + sb->sb_mb->m_nextpkt = nextrecord; + else + sb->sb_mb = nextrecord; + + /* + * Now update any dependent socket buffer fields to reflect the new + * state. This is an expanded inline of SB_EMPTY_FIXUP(), with the + * addition of a second clause that takes care of the case where + * sb_mb has been updated, but remains the last record. + */ + if (sb->sb_mb == NULL) { + sb->sb_mbtail = NULL; + sb->sb_lastrecord = NULL; + } else if (sb->sb_mb->m_nextpkt == NULL) + sb->sb_lastrecord = sb->sb_mb; +} + + +/* * Implement receive operations on a socket. * We depend on the way that records are added to the sockbuf * by sbappend*. In particular, each record (mbufs linked through m_next) @@ -1048,8 +1086,7 @@ sbfree(&so->so_rcv, m); so->so_rcv.sb_mb = m_free(m); m = so->so_rcv.sb_mb; - if (m != NULL) - m->m_nextpkt = nextrecord; + sockbuf_pushsync(&so->so_rcv, nextrecord); } orig_resid = 0; } @@ -1067,14 +1104,7 @@ do { if (flags & MSG_PEEK) { if (controlp != NULL) { - SOCKBUF_UNLOCK(&so->so_rcv); - *controlp = m_copym(m, 0, m->m_len, - M_TRYWAIT); - SOCKBUF_LOCK(&so->so_rcv); - if (*controlp == NULL) { - error = ENOBUFS; - goto release; - } + *controlp = m_copy(m, 0, m->m_len); controlp = &(*controlp)->m_next; } m = m->m_next; @@ -1093,34 +1123,29 @@ m = so->so_rcv.sb_mb; } } while (m != NULL && m->m_type == MT_CONTROL); + if ((flags & MSG_PEEK) == 0) + sockbuf_pushsync(&so->so_rcv, nextrecord); if (cm != NULL) { if (pr->pr_domain->dom_externalize != NULL) { - /* - * NB: drop the lock to avoid potential LORs; - * in particular unix domain sockets grab the - * file descriptor lock which would be a LOR. - */ SOCKBUF_UNLOCK(&so->so_rcv); error = (*pr->pr_domain->dom_externalize) - (cm, controlp); + (cm, controlp); SOCKBUF_LOCK(&so->so_rcv); } else m_freem(cm); } + nextrecord = so->so_rcv.sb_mb->m_nextpkt; orig_resid = 0; } if (m != NULL) { if ((flags & MSG_PEEK) == 0) { - m->m_nextpkt = nextrecord; - /* - * If nextrecord == NULL (this is a single chain), - * then sb_lastrecord may not be valid here if m - * was changed earlier. - */ + KASSERT(m->m_nextpkt == nextrecord, + ("soreceive: post-control, nextrecord !sync")); if (nextrecord == NULL) { KASSERT(so->so_rcv.sb_mb == m, - ("receive tailq 1")); - so->so_rcv.sb_lastrecord = m; + ("soreceive: post-control, sb_mb!=m")); + KASSERT(so->so_rcv.sb_lastrecord == m, + ("soreceive: post-control, lastrecord!=m")); } } type = m->m_type; @@ -1128,9 +1153,12 @@ flags |= MSG_OOB; } else { if ((flags & MSG_PEEK) == 0) { - KASSERT(so->so_rcv.sb_mb == m,("receive tailq 2")); - so->so_rcv.sb_mb = nextrecord; - SB_EMPTY_FIXUP(&so->so_rcv); + KASSERT(so->so_rcv.sb_mb == nextrecord, + ("soreceive: sb_mb != nextrecord")); + if (so->so_rcv.sb_mb == NULL) { + KASSERT(so->so_rcv.sb_lastrecord == NULL, + ("soreceive: sb_lastercord != NULL")); + } } } SOCKBUF_LOCK_ASSERT(&so->so_rcv); ==== //depot/projects/netperf_socket/sys/sys/conf.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/conf.h,v 1.189 2004/06/17 17:16:52 phk Exp $ + * $FreeBSD: src/sys/sys/conf.h,v 1.190 2004/07/11 23:03:37 phk Exp $ */ #ifndef _SYS_CONF_H_ @@ -111,12 +111,6 @@ #define si_copyonwrite __si_u.__si_disk.__sid_copyonwrite /* - * Special device management - */ -#define SPECHSZ 64 -#define SPECHASH(rdev) (((unsigned)(minor(rdev)))%SPECHSZ) - -/* * Definitions of device driver entry switches */ From owner-p4-projects@FreeBSD.ORG Mon Jul 12 03:42:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DABEB16A4D0; Mon, 12 Jul 2004 03:42:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B611616A4CE for ; Mon, 12 Jul 2004 03:42:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B038C43D1F for ; Mon, 12 Jul 2004 03:42:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6C3gWBH098583 for ; Mon, 12 Jul 2004 03:42:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6C3gWZZ098580 for perforce@freebsd.org; Mon, 12 Jul 2004 03:42:32 GMT (envelope-from marcel@freebsd.org) Date: Mon, 12 Jul 2004 03:42:32 GMT Message-Id: <200407120342.i6C3gWZZ098580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2004 03:42:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=57145 Change 57145 by marcel@marcel_nfs on 2004/07/12 03:41:54 libc_r has initialized _thread_run with something other than a NULL pointer. Since we may be asked to map a LWP to a thread handle before libc_r has been initialized and we should not return a handle in that case, we need to check for something that indicates whether libc_r is initialized. Use _thread_initial for that. Affected files ... .. //depot/projects/gdb/lib/libthread_db/libc_r_db.c#3 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/libc_r_db.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ struct td_thragent { TD_THRAGENT_FIELDS; struct ps_prochandle *ta_ph; + psaddr_t ta_thread_initial; psaddr_t ta_thread_list; psaddr_t ta_thread_run; int ta_ofs_ctx; @@ -91,9 +92,15 @@ libc_r_db_ta_map_lwp2thr(const td_thragent_t *ta, lwpid_t lwpid, td_thrhandle_t *th) { + psaddr_t addr; ps_err_e err; th->th_ta = ta; + err = ps_pread(ta->ta_ph, ta->ta_thread_initial, &addr, sizeof(addr)); + if (err != PS_OK) + return (TD_ERR); + if (addr == NULL) + return (TD_NOLWP); err = ps_pread(ta->ta_ph, ta->ta_thread_run, &th->th_thread, sizeof(psaddr_t)); return ((err == PS_OK) ? TD_OK : TD_ERR); @@ -112,6 +119,10 @@ ta->ta_ph = ph; + err = ps_pglobal_lookup(ph, NULL, "_thread_initial", + &ta->ta_thread_initial); + if (err != PS_OK) + goto fail; err = ps_pglobal_lookup(ph, NULL, "_thread_list", &ta->ta_thread_list); if (err != PS_OK) goto fail; From owner-p4-projects@FreeBSD.ORG Mon Jul 12 11:35:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B77B516A4D0; Mon, 12 Jul 2004 11:35:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6141616A4CE for ; Mon, 12 Jul 2004 11:35:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5814043D53 for ; Mon, 12 Jul 2004 11:35:12 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6CBZCbJ014022 for ; Mon, 12 Jul 2004 11:35:12 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6CBZBJk014019 for perforce@freebsd.org; Mon, 12 Jul 2004 11:35:11 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 12 Jul 2004 11:35:11 GMT Message-Id: <200407121135.i6CBZBJk014019@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2004 11:35:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=57170 Change 57170 by davidxu@davidxu_alona on 2004/07/12 11:34:43 IFC @57169 Affected files ... .. //depot/projects/davidxu_ksedbg/src/UPDATING#4 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/top.X#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/top.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/etc/services#3 integrate .. //depot/projects/davidxu_ksedbg/src/games/bcd/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/games/bcd/bcd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/include/regex.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/README#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/engine.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regcomp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regerror.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex.3#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex2.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/libexec/atrun/atrun.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/Makefile.inc.docports#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/alpha/mkisoimages.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/amd64/mkisoimages.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/i386/mkisoimages.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/fe.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/sx.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/vflush.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cy/cy.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/rc/rc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/si/si.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/si/si.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sio/sio.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sx/sx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sx/sx.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/doc/Doxyfile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/doc/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/param.h#3 edit .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/device_if.m#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/init_main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#10 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/tty.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/at_control.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/sio.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/pmap.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/conf.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/kdb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/mount.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/param.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/sx.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/user.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/vnode.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/tools/makeobjops.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/gprof/gprof.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/m4/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/nfsstat/nfsstat.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/split/split.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/split/split.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/top/machine.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/xargs/xargs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mrouted/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sliplogin/sliplogin.c#2 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/UPDATING#4 (text+ko) ==== @@ -54,7 +54,7 @@ 20040702: The native preemption has been added to the kernel scheduler. There is some report that ULE scheduler was broken in some - machines and we encourage users using ULE schedluer either + machines and we encourage users using ULE scheduler either stick with an known good kernel, or temporary switch to 4BSD scheduler as a workaround. @@ -1714,4 +1714,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.324 2004/07/11 04:38:39 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.325 2004/07/11 13:26:44 simon Exp $ ==== //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.7 2004/07/08 16:45:55 keramida Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.8 2004/07/12 03:00:50 alfred Exp $ */ /* @@ -86,6 +86,7 @@ fputs("\ r - renice a process\n\ s - change number of seconds to delay between updates\n\ +S - toggle the displaying of system processes\n\ u - display processes for only one user (+ selects all users)\n\ \n\ \n", stdout); ==== //depot/projects/davidxu_ksedbg/src/contrib/top/top.X#3 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.10 2004/07/01 09:12:38 alfred Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.11 2004/07/12 03:00:50 alfred Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -229,6 +229,9 @@ Change the number of seconds to delay between displays (prompt for new number). .TP +.B S +Toggle the display of system processes. +.TP .B k Send a signal (\*(lqkill\*(rq by default) to a list of processes. This acts similarly to the command ==== //depot/projects/davidxu_ksedbg/src/contrib/top/top.c#4 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.13 2004/07/08 16:45:55 keramida Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.14 2004/07/12 03:00:50 alfred Exp $ */ /* @@ -194,9 +194,9 @@ fd_set readfds; #ifdef ORDER - static char command_chars[] = "\f qh?en#sdkriIutHmo"; + static char command_chars[] = "\f qh?en#sdkriIutHmSo"; #else - static char command_chars[] = "\f qh?en#sdkriIutHm"; + static char command_chars[] = "\f qh?en#sdkriIutHmS"; #endif /* these defines enumerate the "strchr"s of the commands in command_chars */ #define CMD_redraw 0 @@ -218,8 +218,9 @@ #define CMD_selftog 15 #define CMD_thrtog 16 #define CMD_viewtog 17 +#define CMD_viewsys 18 #ifdef ORDER -#define CMD_order 18 +#define CMD_order 19 #endif /* set the buffer for stdout */ @@ -1002,6 +1003,9 @@ d_header = i_header; reset_display(); break; + case CMD_viewsys: + ps.system = !ps.system; + break; #ifdef ORDER case CMD_order: new_message(MT_standout, ==== //depot/projects/davidxu_ksedbg/src/etc/services#3 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.100 2004/07/07 06:15:32 cperciva Exp $ +# $FreeBSD: src/etc/services,v 1.101 2004/07/11 19:20:47 cperciva Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -51,8 +51,8 @@ ftp-data 20/udp #File Transfer [Default Data] ftp 21/tcp #File Transfer [Control] ftp 21/udp #File Transfer [Control] -ssh 22/tcp #Secure Shell Login -ssh 22/udp #Secure Shell Login +ssh 22/tcp #Secure Shell Login +ssh 22/udp #Secure Shell Login telnet 23/tcp telnet 23/udp # 24/tcp any private mail system @@ -91,8 +91,8 @@ ni-ftp 47/udp #NI FTP auditd 48/tcp #Digital Audit Daemon auditd 48/udp #Digital Audit Daemon -tacacs 49/tcp #Login Host Protocol (TACACS) -tacacs 49/udp #Login Host Protocol (TACACS) +tacacs 49/tcp #Login Host Protocol (TACACS) +tacacs 49/udp #Login Host Protocol (TACACS) re-mail-ck 50/tcp #Remote Mail Checking Protocol re-mail-ck 50/udp #Remote Mail Checking Protocol la-maint 51/tcp #IMP Logical Address Maintenance @@ -157,8 +157,8 @@ vettcp 78/udp finger 79/tcp finger 79/udp -http 80/tcp www www-http #World Wide Web HTTP -http 80/udp www www-http #World Wide Web HTTP +http 80/tcp www www-http #World Wide Web HTTP +http 80/udp www www-http #World Wide Web HTTP hosts2-ns 81/tcp #HOSTS2 Name Server hosts2-ns 81/udp #HOSTS2 Name Server xfer 82/tcp #XFER Utility @@ -176,8 +176,8 @@ # 87/tcp any private terminal link #PROBLEMS!=========================================================== # 87/udp any private terminal link -kerberos-sec 88/tcp kerberos # krb5 # Kerberos (v5) -kerberos-sec 88/udp kerberos # krb5 # Kerberos (v5) +kerberos-sec 88/tcp kerberos # krb5 # Kerberos (v5) +kerberos-sec 88/udp kerberos # krb5 # Kerberos (v5) su-mit-tg 89/tcp #SU/MIT Telnet Gateway su-mit-tg 89/udp #SU/MIT Telnet Gateway dnsix 90/tcp #DNSIX Securit Attribute Token Map @@ -211,7 +211,7 @@ acr-nema 104/udp #ACR-NEMA Digital Imag. & Comm. 300 csnet-ns 105/tcp cso-ns cso #Mailbox Name Nameserver csnet-ns 105/udp cso-ns cso #Mailbox Name Nameserver -pop3pw 106/tcp 3com-tsmux #Eudora compatible PW changer +pop3pw 106/tcp 3com-tsmux #Eudora compatible PW changer 3com-tsmux 106/udp rtelnet 107/tcp #Remote Telnet Service rtelnet 107/udp #Remote Telnet Service @@ -285,8 +285,8 @@ emfis-cntl 141/udp #EMFIS Control Service bl-idm 142/tcp #Britton-Lee IDM bl-idm 142/udp #Britton-Lee IDM -imap 143/tcp imap2 imap4 #Interim Mail Access Protocol v2 -imap 143/udp imap2 imap4 #Interim Mail Access Protocol v2 +imap 143/tcp imap2 imap4 #Interim Mail Access Protocol v2 +imap 143/udp imap2 imap4 #Interim Mail Access Protocol v2 NeWS 144/tcp # Window System NeWS 144/udp # Window System #PROBLEMS!============================================================== @@ -384,7 +384,7 @@ qft 189/tcp #Queued File Transport qft 189/udp #Queued File Transport gacp 190/tcp #Gateway Access Control Protocol -gacp 190/udp cacp #Gateway Access Control Protocol +gacp 190/udp cacp #Gateway Access Control Protocol prospero 191/tcp #Prospero Directory Service prospero 191/udp #Prospero Directory Service osu-nms 192/tcp #OSU Network Monitoring System @@ -421,8 +421,8 @@ at-7 207/udp #AppleTalk Unused at-8 208/tcp #AppleTalk Unused at-8 208/udp #AppleTalk Unused -qmtp 209/tcp #The Quick Mail Transfer Protocol -qmtp 209/udp #The Quick Mail Transfer Protocol +qmtp 209/tcp #The Quick Mail Transfer Protocol +qmtp 209/udp #The Quick Mail Transfer Protocol #PROBLEMS!============================================================== #tam 209/tcp #Trivial Authenticated Mail Protocol #tam 209/udp #Trivial Authenticated Mail Protocol @@ -439,8 +439,8 @@ vmpwscs 214/udp softpc 215/tcp #Insignia Solutions softpc 215/udp #Insignia Solutions -CAIlic 216/tcp atls #Computer Associates Int'l License Server -CAIlic 216/udp atls #Computer Associates Int'l License Server +CAIlic 216/tcp atls #Computer Associates Int'l License Server +CAIlic 216/udp atls #Computer Associates Int'l License Server dbase 217/tcp #dBASE Unix dbase 217/udp #dBASE Unix mpp 218/tcp #Netix Message Posting Protocol @@ -476,7 +476,7 @@ set 257/tcp #secure electronic transaction set 257/udp #secure electronic transaction yak-chat 258/tcp #yak winsock personal chat -yak-chat 258/udp #yak winsock personal chat +yak-chat 258/udp #yak winsock personal chat esro-gen 259/tcp #efficient short remote operations esro-gen 259/udp #efficient short remote operations openport 260/tcp @@ -538,11 +538,11 @@ matip-type-b 351/tcp #MATIP Type B matip-type-b 351/udp bhoetty 351/tcp #unassigned but widespread use -bhoetty 351/udp #unassigned but widespread use +bhoetty 351/udp #unassigned but widespread use dtag-ste-sb 352/tcp #DTAG dtag-ste-sb 352/udp #DTAG -bhoedap4 352/tcp #unassigned but widespread use -bhoedap4 352/udp #unassigned but widespread use +bhoedap4 352/tcp #unassigned but widespread use +bhoedap4 352/udp #unassigned but widespread use ndsauth 353/tcp ndsauth 353/udp bh611 354/tcp @@ -567,8 +567,8 @@ rsvp_tunnel 363/udp aurora-cmgr 364/tcp aurora-cmgr 364/udp -dtk 365/tcp #Deception Tool Kit - Fred Cohen -dtk 365/udp #Deception Tool Kit - Fred Cohen +dtk 365/tcp #Deception Tool Kit - Fred Cohen +dtk 365/udp #Deception Tool Kit - Fred Cohen odmr 366/tcp odmr 366/udp mortgageware 367/tcp @@ -910,7 +910,7 @@ utime 519/tcp unixtime utime 519/udp unixtime efs 520/tcp #extended file name server -router 520/udp route routed #local routing process (on site); +router 520/udp route routed #local routing process (on site); # uses variant of Xerox NS routing # information protocol ripng 521/tcp @@ -957,8 +957,8 @@ uucp-rlogin 541/udp commerce 542/tcp commerce 542/udp -klogin 543/tcp # Kerberos (v4/v5) -klogin 543/udp # Kerberos (v4/v5) +klogin 543/tcp # Kerberos (v4/v5) +klogin 543/udp # Kerberos (v4/v5) kshell 544/tcp krcmd # Kerberos (v4/v5) kshell 544/udp krcmd # Kerberos (v4/v5) appleqtcsrvr 545/tcp @@ -1087,14 +1087,14 @@ npmp-gui 611/udp sshell 614/tcp #SSLshell sshell 614/udp -ipp 631/tcp #IPP (Internet Printing Protocol) -ipp 631/udp #IPP (Internet Printing Protocol) +ipp 631/tcp #IPP (Internet Printing Protocol) +ipp 631/udp #IPP (Internet Printing Protocol) ginad 634/tcp ginad 634/udp -ldaps 636/tcp sldap #ldap protocol over TLS/SSL -ldaps 636/udp sldap -aodv 654/tcp #Ad-Hoc On-Demand Distance Vector Routing Protocol -aodv 654/udp #Ad-Hoc On-Demand Distance Vector Routing Protocol +ldaps 636/tcp sldap #ldap protocol over TLS/SSL +ldaps 636/udp sldap +aodv 654/tcp #Ad-Hoc On-Demand Distance Vector Routing Protocol +aodv 654/udp #Ad-Hoc On-Demand Distance Vector Routing Protocol mdqs 666/tcp mdqs 666/udp #PROBLEMS!=============================================== @@ -1123,10 +1123,10 @@ fujitsu-dev 747/udp #Fujitsu Device Control ris-cm 748/tcp #Russell Info Sci Calendar Manager ris-cm 748/udp #Russell Info Sci Calendar Manager -kerberos-adm 749/tcp #Kerberos administration (v5) -kerberos-adm 749/udp #Kerberos administration (v5) -kerberos-iv 750/udp kdc # Kerberos (v4) -kerberos-iv 750/tcp kdc # Kerberos (v4) +kerberos-adm 749/tcp #Kerberos administration (v5) +kerberos-adm 749/udp #Kerberos administration (v5) +kerberos-iv 750/udp kdc # Kerberos (v4) +kerberos-iv 750/tcp kdc # Kerberos (v4) #PROBLEMS!======================================================== #rfile 750/tcp #loadav 750/udp @@ -1141,21 +1141,21 @@ qrh 752/udp rrh 753/tcp rrh 753/udp -krb_prop 754/tcp krb5_prop # kerberos/v5 server propagation +krb_prop 754/tcp krb5_prop # kerberos/v5 server propagation #PROBLEMS!======================================================== -tell 754/tcp #send +tell 754/tcp #send #PROBLEMS!======================================================== -tell 754/udp #send +tell 754/udp #send nlogin 758/tcp nlogin 758/udp con 759/tcp con 759/udp -krbupdate 760/tcp kreg # Kerberos (v4) registration +krbupdate 760/tcp kreg # Kerberos (v4) registration #PROBLEMS!======================================================== ns 760/tcp #PROBLEMS!======================================================== ns 760/udp -kpasswd 761/tcp kpwd # Kerberos (v4) "passwd" +kpasswd 761/tcp kpwd # Kerberos (v4) "passwd" #PROBLEMS!======================================================== rxe 761/tcp #PROBLEMS!======================================================== @@ -1194,25 +1194,25 @@ mdbs_daemon 800/udp device 801/tcp device 801/udp -supfilesrv 871/tcp # for SUP +supfilesrv 871/tcp # for SUP rsync 873/tcp rsync 873/udp accessbuilder 888/tcp accessbuilder 888/udp -swat 901/tcp # samba web configuration tool -rndc 953/tcp # named's rndc control socket -ftps-data 989/tcp # ftp protocol, data, over TLS/SSL +swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket +ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp -ftps 990/tcp # ftp protocol, control, over TLS/SSL +ftps 990/tcp # ftp protocol, control, over TLS/SSL ftps 990/udp -telnets 992/tcp # telnet protocol over TLS/SSL +telnets 992/tcp # telnet protocol over TLS/SSL telnets 992/udp -imaps 993/tcp # imap4 protocol over TLS/SSL +imaps 993/tcp # imap4 protocol over TLS/SSL imaps 993/udp -ircs 994/tcp # irc protocol over TLS/SSL +ircs 994/tcp # irc protocol over TLS/SSL ircs 994/udp -pop3s 995/tcp spop3 # pop3 protocol over TLS/SSL -pop3s 995/udp spop3 +pop3s 995/tcp spop3 # pop3 protocol over TLS/SSL +pop3s 995/udp spop3 vsinet 996/tcp vsinet 996/udp maitrd 997/tcp @@ -1220,7 +1220,7 @@ busboy 998/tcp puparp 998/udp garcon 999/tcp -applix 999/udp #Applix ac +applix 999/udp #Applix ac puprouter 999/tcp puprouter 999/udp cadlock2 1000/tcp @@ -1256,7 +1256,7 @@ kpop 1109/udp #Unofficial nfsd-status 1110/tcp #Cluster status info nfsd-keepalive 1110/udp #Client status info -supfiledbg 1127/tcp # for SUP +supfiledbg 1127/tcp # for SUP nfa 1155/tcp #Network File Access nfa 1155/udp #Network File Access phone 1167/udp #conference calling @@ -1491,34 +1491,34 @@ esl-lm 1455/udp #ESL License Manager dca 1456/tcp dca 1456/udp -valisys-lm 1457/tcp #Valisys License Manager -valisys-lm 1457/udp #Valisys License Manager -nrcabq-lm 1458/tcp #Nichols Research Corp. -nrcabq-lm 1458/udp #Nichols Research Corp. -proshare1 1459/tcp #Proshare Notebook Application -proshare1 1459/udp #Proshare Notebook Application -proshare2 1460/tcp #Proshare Notebook Application -proshare2 1460/udp #Proshare Notebook Application -ibm_wrless_lan 1461/tcp #IBM Wireless LAN -ibm_wrless_lan 1461/udp #IBM Wireless LAN -world-lm 1462/tcp #World License Manager -world-lm 1462/udp #World License Manager +valisys-lm 1457/tcp #Valisys License Manager +valisys-lm 1457/udp #Valisys License Manager +nrcabq-lm 1458/tcp #Nichols Research Corp. +nrcabq-lm 1458/udp #Nichols Research Corp. +proshare1 1459/tcp #Proshare Notebook Application +proshare1 1459/udp #Proshare Notebook Application +proshare2 1460/tcp #Proshare Notebook Application +proshare2 1460/udp #Proshare Notebook Application +ibm_wrless_lan 1461/tcp #IBM Wireless LAN +ibm_wrless_lan 1461/udp #IBM Wireless LAN +world-lm 1462/tcp #World License Manager +world-lm 1462/udp #World License Manager nucleus 1463/tcp nucleus 1463/udp -msl_lmd 1464/tcp #MSL License Manager -msl_lmd 1464/udp #MSL License Manager -pipes 1465/tcp #Pipes Platform -pipes 1465/udp #Pipes Platform mfarlin@peerlogic.com -oceansoft-lm 1466/tcp #Ocean Software License Manager -oceansoft-lm 1466/udp #Ocean Software License Manager +msl_lmd 1464/tcp #MSL License Manager +msl_lmd 1464/udp #MSL License Manager +pipes 1465/tcp #Pipes Platform +pipes 1465/udp #Pipes Platform mfarlin@peerlogic.com +oceansoft-lm 1466/tcp #Ocean Software License Manager +oceansoft-lm 1466/udp #Ocean Software License Manager csdmbase 1467/tcp csdmbase 1467/udp csdm 1468/tcp csdm 1468/udp -aal-lm 1469/tcp #Active Analysis Limited License Manager -aal-lm 1469/udp #Active Analysis Limited License Manager -uaiact 1470/tcp #Universal Analytics -uaiact 1470/udp #Universal Analytics +aal-lm 1469/tcp #Active Analysis Limited License Manager +aal-lm 1469/udp #Active Analysis Limited License Manager +uaiact 1470/tcp #Universal Analytics +uaiact 1470/udp #Universal Analytics csdmbase 1471/tcp csdmbase 1471/udp csdm 1472/tcp @@ -1527,8 +1527,8 @@ openmath 1473/udp telefinder 1474/tcp telefinder 1474/udp -taligent-lm 1475/tcp #Taligent License Manager -taligent-lm 1475/udp #Taligent License Manager +taligent-lm 1475/tcp #Taligent License Manager +taligent-lm 1475/udp #Taligent License Manager clvm-cfg 1476/tcp clvm-cfg 1476/udp ms-sna-server 1477/tcp @@ -1541,12 +1541,12 @@ pacerforum 1480/udp airs 1481/tcp airs 1481/udp -miteksys-lm 1482/tcp #Miteksys License Manager -miteksys-lm 1482/udp #Miteksys License Manager -afs 1483/tcp #AFS License Manager -afs 1483/udp #AFS License Manager -confluent 1484/tcp #Confluent License Manager -confluent 1484/udp #Confluent License Manager +miteksys-lm 1482/tcp #Miteksys License Manager +miteksys-lm 1482/udp #Miteksys License Manager +afs 1483/tcp #AFS License Manager +afs 1483/udp #AFS License Manager +confluent 1484/tcp #Confluent License Manager +confluent 1484/udp #Confluent License Manager lansource 1485/tcp lansource 1485/udp nms_topo_serv 1486/tcp @@ -1575,81 +1575,81 @@ rfx-lm 1497/udp watcom-sql 1498/tcp watcom-sql 1498/udp -fhc 1499/tcp #Federico Heinz Consultora -fhc 1499/udp #Federico Heinz Consultora -vlsi-lm 1500/tcp #VLSI License Manager -vlsi-lm 1500/udp #VLSI License Manager -sas-3 1501/tcp #Satellite-data Acquisition System 3 -sas-3 1501/udp #Satellite-data Acquisition System 3 -shivadiscovery 1502/tcp #Shiva -shivadiscovery 1502/udp #Shiva -imtc-mcs 1503/tcp #Databeam -imtc-mcs 1503/udp #Databeam -evb-elm 1504/tcp #EVB Software Engineering License Manager -evb-elm 1504/udp #EVB Software Engineering License Manager -funkproxy 1505/tcp #Funk Software, Inc. -funkproxy 1505/udp #Funk Software, Inc. -utcd 1506/tcp #Universal Time daemon (utcd) -utcd 1506/udp #Universal Time daemon (utcd) +fhc 1499/tcp #Federico Heinz Consultora +fhc 1499/udp #Federico Heinz Consultora +vlsi-lm 1500/tcp #VLSI License Manager +vlsi-lm 1500/udp #VLSI License Manager +sas-3 1501/tcp #Satellite-data Acquisition System 3 +sas-3 1501/udp #Satellite-data Acquisition System 3 +shivadiscovery 1502/tcp #Shiva +shivadiscovery 1502/udp #Shiva +imtc-mcs 1503/tcp #Databeam +imtc-mcs 1503/udp #Databeam +evb-elm 1504/tcp #EVB Software Engineering License Manager +evb-elm 1504/udp #EVB Software Engineering License Manager +funkproxy 1505/tcp #Funk Software, Inc. +funkproxy 1505/udp #Funk Software, Inc. +utcd 1506/tcp #Universal Time daemon (utcd) +utcd 1506/udp #Universal Time daemon (utcd) symplex 1507/tcp symplex 1507/udp diagmond 1508/tcp diagmond 1508/udp -robcad-lm 1509/tcp #Robcad, Ltd. License Manager -robcad-lm 1509/udp #Robcad, Ltd. License Manager -mvx-lm 1510/tcp #Midland Valley Exploration Ltd. Lic. Man. -mvx-lm 1510/udp #Midland Valley Exploration Ltd. Lic. Man. +robcad-lm 1509/tcp #Robcad, Ltd. License Manager +robcad-lm 1509/udp #Robcad, Ltd. License Manager +mvx-lm 1510/tcp #Midland Valley Exploration Ltd. Lic. Man. +mvx-lm 1510/udp #Midland Valley Exploration Ltd. Lic. Man. 3l-l1 1511/tcp 3l-l1 1511/udp -wins 1512/tcp #Microsoft's Windows Internet Name Service -wins 1512/udp #Microsoft's Windows Internet Name Service -fujitsu-dtc 1513/tcp #Fujitsu Systems Business of America, Inc -fujitsu-dtc 1513/udp #Fujitsu Systems Business of America, Inc -fujitsu-dtcns 1514/tcp #Fujitsu Systems Business of America, Inc -fujitsu-dtcns 1514/udp #Fujitsu Systems Business of America, Inc +wins 1512/tcp #Microsoft's Windows Internet Name Service +wins 1512/udp #Microsoft's Windows Internet Name Service +fujitsu-dtc 1513/tcp #Fujitsu Systems Business of America, Inc +fujitsu-dtc 1513/udp #Fujitsu Systems Business of America, Inc +fujitsu-dtcns 1514/tcp #Fujitsu Systems Business of America, Inc +fujitsu-dtcns 1514/udp #Fujitsu Systems Business of America, Inc ifor-protocol 1515/tcp ifor-protocol 1515/udp -vpad 1516/tcp #Virtual Places Audio data -vpad 1516/udp #Virtual Places Audio data -vpac 1517/tcp #Virtual Places Audio control -vpac 1517/udp #Virtual Places Audio control -vpvd 1518/tcp #Virtual Places Video data -vpvd 1518/udp #Virtual Places Video data -vpvc 1519/tcp #Virtual Places Video control -vpvc 1519/udp #Virtual Places Video control -atm-zip-office 1520/tcp #atm zip office -atm-zip-office 1520/udp #atm zip office -ncube-lm 1521/tcp #nCube License Manager -ncube-lm 1521/udp #nCube License Manager -rna-lm 1522/tcp #Ricardo North America License Manager -rna-lm 1522/udp #Ricardo North America License Manager +vpad 1516/tcp #Virtual Places Audio data +vpad 1516/udp #Virtual Places Audio data +vpac 1517/tcp #Virtual Places Audio control +vpac 1517/udp #Virtual Places Audio control +vpvd 1518/tcp #Virtual Places Video data +vpvd 1518/udp #Virtual Places Video data +vpvc 1519/tcp #Virtual Places Video control +vpvc 1519/udp #Virtual Places Video control +atm-zip-office 1520/tcp #atm zip office +atm-zip-office 1520/udp #atm zip office +ncube-lm 1521/tcp #nCube License Manager +ncube-lm 1521/udp #nCube License Manager +rna-lm 1522/tcp #Ricardo North America License Manager +rna-lm 1522/udp #Ricardo North America License Manager cichild-lm 1523/tcp cichild-lm 1523/udp -ingreslock 1524/tcp #ingres -ingreslock 1524/udp #ingres -prospero-np 1525/tcp #Prospero Directory Service non-priv -prospero-np 1525/udp #Prospero Directory Service non-priv +ingreslock 1524/tcp #ingres +ingreslock 1524/udp #ingres +prospero-np 1525/tcp #Prospero Directory Service non-priv +prospero-np 1525/udp #Prospero Directory Service non-priv #PROBLEMS!======================================================== -orasrv 1525/tcp #oracle -orasrv 1525/udp #oracle +orasrv 1525/tcp #oracle +orasrv 1525/udp #oracle #PROBLEMS!======================================================== -pdap-np 1526/tcp #Prospero Data Access Prot non-priv -pdap-np 1526/udp #Prospero Data Access Prot non-priv -tlisrv 1527/tcp #oracle -tlisrv 1527/udp #oracle +pdap-np 1526/tcp #Prospero Data Access Prot non-priv +pdap-np 1526/udp #Prospero Data Access Prot non-priv +tlisrv 1527/tcp #oracle +tlisrv 1527/udp #oracle mciautoreg 1528/tcp mciautoreg 1528/udp -support 1529/tcp prmsd gnatsd # cygnus bug tracker -coauthor 1529/tcp #oracle -coauthor 1529/udp #oracle +support 1529/tcp prmsd gnatsd # cygnus bug tracker +coauthor 1529/tcp #oracle +coauthor 1529/udp #oracle rap-service 1530/tcp rap-service 1530/udp rap-listen 1531/tcp rap-listen 1531/udp miroconnect 1532/tcp miroconnect 1532/udp -virtual-places 1533/tcp #Virtual Places Software -virtual-places 1533/udp #Virtual Places Software +virtual-places 1533/tcp #Virtual Places Software +virtual-places 1533/udp #Virtual Places Software micromuse-lm 1534/tcp micromuse-lm 1534/udp ampr-info 1535/tcp @@ -1660,8 +1660,8 @@ sdsc-lm 1537/udp 3ds-lm 1538/tcp 3ds-lm 1538/udp -intellistor-lm 1539/tcp #Intellistor License Manager -intellistor-lm 1539/udp #Intellistor License Manager +intellistor-lm 1539/tcp #Intellistor License Manager +intellistor-lm 1539/udp #Intellistor License Manager rds 1540/tcp rds 1540/udp rds2 1541/tcp @@ -1678,12 +1678,12 @@ abbaccuray 1546/udp laplink 1547/tcp laplink 1547/udp -axon-lm 1548/tcp #Axon License Manager -axon-lm 1548/udp #Axon License Manager -shivahose 1549/tcp #Shiva Hose -shivasound 1549/udp #Shiva Sound -3m-image-lm 1550/tcp #Image Storage license manager 3M Company -3m-image-lm 1550/udp #Image Storage license manager 3M Company +axon-lm 1548/tcp #Axon License Manager +axon-lm 1548/udp #Axon License Manager +shivahose 1549/tcp #Shiva Hose +shivasound 1549/udp #Shiva Sound +3m-image-lm 1550/tcp #Image Storage license manager 3M Company +3m-image-lm 1550/udp #Image Storage license manager 3M Company hecmtl-db 1551/tcp hecmtl-db 1551/udp pciarray 1552/tcp @@ -1776,13 +1776,13 @@ wizard 2001/udp #curry globe 2002/tcp globe 2002/udp -cfingerd 2003/tcp #GNU finger +cfingerd 2003/tcp #GNU finger mailbox 2004/tcp -emce 2004/udp #CCWS mm conf +emce 2004/udp #CCWS mm conf berknet 2005/tcp oracle 2005/udp invokator 2006/tcp -raid-cc 2006/udp #raid +raid-cc 2006/udp #raid dectalk 2007/tcp raid-am 2007/udp conf 2008/tcp @@ -1791,7 +1791,7 @@ whosockami 2009/udp search 2010/tcp pipe_server 2010/udp -raid-cc 2011/tcp #raid +raid-cc 2011/tcp #raid servserv 2011/udp ttyinfo 2012/tcp raid-ac 2012/udp @@ -1857,8 +1857,8 @@ #dls 2047/udp dls-monitor 2048/tcp dls-monitor 2048/udp -nfsd 2049/tcp nfs # NFS server daemon -nfsd 2049/udp nfs # NFS server daemon +nfsd 2049/tcp nfs # NFS server daemon +nfsd 2049/udp nfs # NFS server daemon #PROBLEMS!============================================================= #shilp 2049/tcp #shilp 2049/udp @@ -1928,8 +1928,7 @@ bmap 3421/tcp #Bull Apprise portmapper bmap 3421/udp #Bull Apprise portmapper prsvp 3455/tcp #RSVP Port -prsvp 3455/udp #RSVP Port -rsvp-encap 3455/udp #RSVP encapsulated in UDP +prsvp 3455/udp rsvp-encap #RSVP Port vat 3456/tcp #VAT default data vat 3456/udp #VAT default data vat-control 3457/tcp #VAT default control @@ -1948,7 +1947,7 @@ mapper-ws_ethd 3986/udp #MAPPER workstation server netcheque 4008/tcp #NetCheque accounting netcheque 4008/udp #NetCheque accounting -lockd 4045/udp # NFS lock daemon/manager +lockd 4045/udp # NFS lock daemon/manager lockd 4045/tcp nuts_dem 4132/tcp #NUTS Daemon nuts_dem 4132/udp #NUTS Daemon @@ -2102,16 +2101,12 @@ amidxtape 10083/tcp #Amanda tape indexing isode-dua 17007/tcp isode-dua 17007/udp -biimenu 18000/tcp #Beckman Instruments, Inc. -biimenu 18000/udp #Beckman Instruments, Inc. -wnn4 22273/tcp #Wnn4 (Japanese input) -wnn6 22273/tcp #Wnn6 (Japanese input) -wnn4_Cn 22289/tcp #Wnn4 (Chinese input) -wnn6_Cn 22289/tcp #Wnn6 (Chinese input) -wnn4_Kr 22305/tcp #Wnn4 (Korean input) -wnn6_Kr 22305/tcp #Wnn6 (Korean input) -wnn4_Tw 22321/tcp #Wnn4 (Taiwanse input) -wnn6_Tw 22321/tcp #Wnn6 (Taiwanse input) +biimenu 18000/tcp #Beckman Instruments, Inc. +biimenu 18000/udp #Beckman Instruments, Inc. +wnn4 22273/tcp wnn6 #Wnn4 (Japanese input) +wnn4_Cn 22289/tcp wnn6_Cn #Wnn4 (Chinese input) +wnn4_Kr 22305/tcp wnn6_Kr #Wnn4 (Korean input) +wnn4_Tw 22321/tcp wnn6_Tw #Wnn4 (Taiwanse input) wnn6_DS 26208/tcp #Wnn6 (Dserver) -dbbrowse 47557/tcp #Databeam Corporation -dbbrowse 47557/udp #Databeam Corporation +dbbrowse 47557/tcp #Databeam Corporation +dbbrowse 47557/udp #Databeam Corporation ==== //depot/projects/davidxu_ksedbg/src/games/bcd/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/bcd/Makefile,v 1.5 2001/03/26 14:20:54 ru Exp $ +# $FreeBSD: src/games/bcd/Makefile,v 1.6 2004/07/11 17:26:18 stefanf Exp $ PROG= bcd +WARNS?= 6 MAN= bcd.6 MLINKS= bcd.6 ppt.6 ==== //depot/projects/davidxu_ksedbg/src/games/bcd/bcd.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bcd.c 8.2 (Berkeley) 3/20/94"; #endif static const char rcsid[] = - "$FreeBSD: src/games/bcd/bcd.c,v 1.8 1999/11/30 03:48:41 billf Exp $"; + "$FreeBSD: src/games/bcd/bcd.c,v 1.9 2004/07/11 17:26:18 stefanf Exp $"; #endif /* not lint */ /* @@ -80,9 +80,11 @@ #include +#include #include +#include #include -#include +#include u_short holes[256] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, @@ -119,15 +121,15 @@ 0x202, 0x201, 0x082, 0x806, 0x822, 0x600, 0x282, 0x0 }; +void printcard(char *); + /* * i'th bit of w. */ #define bit(w,i) ((w)&(1<<(i))) int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { char cardline[80]; @@ -150,16 +152,15 @@ #define COLUMNS 48 -printcard(str) - char *str; +void +printcard(char *str) { static char rowchars[] = " 123456789"; int i, row; char *p; - char *index(); /* ruthlessly remove newlines and truncate at 48 characters. */ - if ((p = index(str, '\n'))) + if ((p = strchr(str, '\n'))) *p = '\0'; if (strlen(str) > COLUMNS) @@ -183,7 +184,7 @@ p = str; putchar('/'); for (i = 1; *p; i++, p++) - if (holes[*p]) + if (holes[(unsigned char)*p]) putchar(*p); else putchar(' '); @@ -201,7 +202,7 @@ for (row = 0; row <= 11; ++row) { putchar('|'); for (i = 0, p = str; *p; i++, p++) { - if (bit(holes[*p], 11 - row)) + if (bit(holes[(unsigned char)*p], 11 - row)) putchar(']'); else putchar(rowchars[row]); ==== //depot/projects/davidxu_ksedbg/src/include/regex.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)regex.h 8.2 (Berkeley) 1/3/94 - * $FreeBSD: src/include/regex.h,v 1.10 2003/12/18 10:41:39 jkh Exp $ + * $FreeBSD: src/include/regex.h,v 1.11 2004/07/12 06:07:26 tjr Exp $ */ #ifndef _REGEX_H_ @@ -92,6 +92,7 @@ #define REG_EMPTY 14 #define REG_ASSERT 15 #define REG_INVARG 16 +#define REG_ILLSEQ 17 #define REG_ATOI 255 /* convert name to number (!) */ #define REG_ITOA 0400 /* convert number to name (!) */ ==== //depot/projects/davidxu_ksedbg/src/lib/libarchive/README#2 (text+ko) ==== @@ -1,23 +1,44 @@ -$FreeBSD: src/lib/libarchive/README,v 1.1 2004/02/09 23:22:53 kientzle Exp $ +$FreeBSD: src/lib/libarchive/README,v 1.2 2004/07/12 01:54:37 kientzle Exp $ libarchive: a library for reading and writing streaming archives This is all under a BSD license. Use, enjoy, but don't blame me if it breaks! -As of February, 2004, the library proper is fairly complete and compiles -cleanly on FreeBSD 5-CURRENT. The API should be stable now. - Documentation: - * libarchive(3) gives an overview of the library as a whole - * archive_read(3) and archive_write(3) provide detailed calling + * libarchive.3 gives an overview of the library as a whole + * archive_read.3 and archive_write.3 provide detailed calling sequences for the read and write APIs - * archive_entry(3) details the "struct archive_entry" utility class - * tar(5) documents the "tar" file formats supported by the library + * archive_entry.3 details the "struct archive_entry" utility class + * tar.5 documents the "tar" file formats supported by the library You should also read the copious comments in "archive.h" and the source code for the sample "bsdtar" program for more details. Please let me know about any errors or omissions you find. (In particular, I no doubt missed -a few things when researching the tar(5) page.) +a few things when researching the tar.5 page.) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 12 14:29:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3F7E16A4D0; Mon, 12 Jul 2004 14:29:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EE2116A4CE for ; Mon, 12 Jul 2004 14:29:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 979F143D2F for ; Mon, 12 Jul 2004 14:29:47 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6CETlut019386 for ; Mon, 12 Jul 2004 14:29:47 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6CETlsw019383 for perforce@freebsd.org; Mon, 12 Jul 2004 14:29:47 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 12 Jul 2004 14:29:47 GMT Message-Id: <200407121429.i6CETlsw019383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57179 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2004 14:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=57179 Change 57179 by davidxu@davidxu_alona on 2004/07/12 14:28:57 Following macrel's PT_LWPINFO commit. I changed p_xlwpid to p_xthread, because a pointer is better than an id, with pointer, you can access its data without further searching. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#11 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exit.c#3 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#9 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#11 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#7 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#6 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#11 (text+ko) ==== @@ -233,12 +233,12 @@ static long get_current_lwp (int pid) { - lwpid_t lwp; + struct ptrace_lwpinfo pl; - if (ptrace (PT_GETXTHREAD, GET_PID(inferior_ptid), (caddr_t)&lwp, 0)) - perror_with_name("PT_GETXTHREAD"); + if (ptrace (PT_LWPINFO, pid, (caddr_t)&pl, sizeof(pl))) + perror_with_name("PT_LWPINFO"); - return (long)lwp; + return (long)pl.pl_lwpid; } static void @@ -485,14 +485,13 @@ fbsd_thread_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { ptid_t ret; - lwpid_t lwp; + long lwp; CORE_ADDR stop_pc; ret = child_ops.to_wait (ptid, ourstatus); if (GET_PID(ret) >= 0 && ourstatus->kind == TARGET_WAITKIND_STOPPED) { - if (ptrace (PT_GETXTHREAD, GET_PID(ret), (caddr_t)&lwp, 0)) - perror_with_name ("ptrace cannot get current lwp"); + lwp = get_current_lwp (proc_handle.pid); ret = thread_from_lwp (BUILD_LWP (lwp, GET_PID (ret))); if (!in_thread_list (ret)) add_thread (ret); ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exit.c#3 (text+ko) ==== @@ -429,7 +429,7 @@ mtx_lock(&Giant); PROC_LOCK(p); p->p_xstat = rv; - p->p_xlwpid = td->td_tid; + p->p_xthread = td; *p->p_ru = p->p_stats->p_ru; mtx_lock_spin(&sched_lock); calcru(p, &p->p_ru->ru_utime, &p->p_ru->ru_stime, NULL); ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#9 (text+ko) ==== @@ -1881,7 +1881,7 @@ goto out; p->p_flag |= P_STOPPED_SIG; p->p_xstat = sig; - p->p_xlwpid = td->td_tid; + p->p_xthread = td; mtx_lock_spin(&sched_lock); FOREACH_THREAD_IN_PROC(p, td0) { if (TD_IS_SLEEPING(td0) && @@ -2194,7 +2194,7 @@ &p->p_mtx.mtx_object, "Catching SIGSTOP"); p->p_flag |= P_STOPPED_SIG; p->p_xstat = sig; - p->p_xlwpid = td->td_tid; + p->p_xthread = td; mtx_lock_spin(&sched_lock); FOREACH_THREAD_IN_PROC(p, td0) { if (TD_IS_SLEEPING(td0) && ==== //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#11 (text+ko) ==== @@ -376,7 +376,7 @@ struct ptrace_lwpinfo *pl; int error, write, tmp, num; int proctree_locked = 0; - lwpid_t tid = 0, tid2, *buf; + lwpid_t tid = 0, *buf; pid_t saved_pid = pid; curp = td->td_proc; @@ -657,21 +657,16 @@ /* deliver or queue signal */ if (P_SHOULDSTOP(p)) { p->p_xstat = data; - p->p_xlwpid = 0; p->p_flag &= ~(P_STOPPED_TRACE|P_STOPPED_SIG); mtx_lock_spin(&sched_lock); - if (req == PT_DETACH || saved_pid <= PID_MAX) { - if (p->p_xthread) { - p->p_xthread->td_flags &= ~TDF_XSIG; - p->p_xthread->td_xsig = data; - p->p_xthread = NULL; - } + if (saved_pid <= PID_MAX) { + p->p_xthread->td_flags &= ~TDF_XSIG; + p->p_xthread->td_xsig = data; } else { td2->td_flags &= ~TDF_XSIG; td2->td_xsig = data; - if (p->p_xthread == td2) - p->p_xthread = NULL; } + p->p_xthread = NULL; if (req == PT_DETACH) { struct thread *td3; FOREACH_THREAD_IN_PROC(p, td3) @@ -806,27 +801,26 @@ return (EINVAL); pl = addr; _PHOLD(p); - pl->pl_lwpid = p->p_xlwpid; + if (saved_pid <= PID_MAX) { + pl->pl_lwpid = p->p_xthread->td_tid; + pl->pl_event = PL_EVENT_SIGNAL; + } else { + pl->pl_lwpid = td2->td_tid; + if (td2->td_flags & TDF_XSIG) + pl->pl_event = PL_EVENT_SIGNAL; + else + pl->pl_event = 0; + } _PRELE(p); PROC_UNLOCK(p); - pl->pl_event = PL_EVENT_SIGNAL; return (0); - case PT_GETNUMTHRS: + case PT_GETNUMLWPS: td->td_retval[0] = p->p_numthreads; PROC_UNLOCK(p); return (0); - case PT_GETXTHREAD: /* Get trigger thread */ - if (p->p_xthread) - tid2 = p->p_xthread->td_tid; - else - tid2 = td2->td_tid; - PROC_UNLOCK(p); - error = copyout(&tid2, addr, sizeof(lwpid_t)); - return (error); - - case PT_GETTHRLIST: + case PT_GETLWPLIST: if (data <= 0) { PROC_UNLOCK(p); return (EINVAL); @@ -887,7 +881,7 @@ p->p_step = 1; do { p->p_xstat = val; - p->p_xlwpid = 0; + p->p_xthread = NULL; p->p_stype = event; /* Which event caused the stop? */ wakeup(&p->p_stype); /* Wake up any PIOCWAIT'ing procs */ msleep(&p->p_step, &p->p_mtx, PWAIT, "stopevent", 0); ==== //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#7 (text+ko) ==== @@ -605,7 +605,6 @@ #define p_endcopy p_xstat u_short p_xstat; /* (c) Exit status; also stop sig. */ - lwpid_t p_xlwpid; /* (c) Thread corresponding p_xstat. */ int p_numthreads; /* (j) Number of threads. */ int p_numksegrps; /* (?) number of ksegrps */ struct mdproc p_md; /* Any machine-dependent fields. */ ==== //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#6 (text+ko) ==== @@ -48,6 +48,12 @@ #define PT_DETACH 11 /* stop tracing a process */ #define PT_IO 12 /* do I/O to/from stopped process. */ #define PT_LWPINFO 13 /* Info about the LWP that stopped. */ +#define PT_GETNUMLWPS 14 /* get total number of threads */ +#define PT_GETLWPLIST 15 /* get thread list */ +#define PT_CLEARSTEP 16 /* turn off single step */ +#define PT_SETSTEP 17 /* turn on single step */ +#define PT_SUSPEND 18 /* suspend a thread */ +#define PT_RESUME 19 /* resume a thread */ #define PT_TO_SCE 20 #define PT_TO_SCX 21 @@ -59,13 +65,6 @@ #define PT_SETFPREGS 36 /* set floating-point registers */ #define PT_GETDBREGS 37 /* get debugging registers */ #define PT_SETDBREGS 38 /* set debugging registers */ -#define PT_GETNUMTHRS 39 /* get total number of threads */ -#define PT_GETXTHREAD 40 /* get signal trigger thread */ -#define PT_GETTHRLIST 41 /* get thread list */ -#define PT_CLEARSTEP 42 /* turn off single step */ -#define PT_SETSTEP 43 /* turn on single step */ -#define PT_SUSPEND 44 /* suspend a thread */ -#define PT_RESUME 45 /* resume a thread */ #define PT_FIRSTMACH 64 /* for machine-specific requests */ #include /* machine-specific requests, if any */ From owner-p4-projects@FreeBSD.ORG Mon Jul 12 14:46:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E87F816A4D0; Mon, 12 Jul 2004 14:46:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB75D16A4CE for ; Mon, 12 Jul 2004 14:46:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AB9143D2D for ; Mon, 12 Jul 2004 14:46:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6CEk8Q5019858 for ; Mon, 12 Jul 2004 14:46:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6CEk8hT019855 for perforce@freebsd.org; Mon, 12 Jul 2004 14:46:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 12 Jul 2004 14:46:08 GMT Message-Id: <200407121446.i6CEk8hT019855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2004 14:46:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=57181 Change 57181 by rwatson@rwatson_tislabs on 2004/07/12 14:45:18 Integrate netperf_socket from rwatson_netperf: ddb gets gdb command again ata recovery fixes vfs_root accepts thread argument vflush accepts thread argument kse debugging related changes nfs with ipv6 related fixes spls removed from netatalk -- looped back from rwatson_netperf ng_frame_relay constification -- looped back from rwatson_netperf ng_socket locking of global list -- looped back from rwatson_netperf Affected files ... .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/conf/files#39 integrate .. //depot/projects/netperf_socket/sys/ddb/db_command.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/init_main.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/sys_process.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#32 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_export.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/netperf_socket/sys/modules/firewire/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/firewire/fwip/Makefile#1 branch .. //depot/projects/netperf_socket/sys/netatalk/at_control.c#6 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#10 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_frame_relay.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#10 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#10 integrate .. //depot/projects/netperf_socket/sys/sys/kdb.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/kse.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#19 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/ptrace.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#21 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#9 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/user.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#8 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vfsops.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.48 2004/06/16 09:46:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.50 2004/07/12 14:11:26 rwatson Exp $"); #include @@ -252,7 +252,7 @@ active = coda_kill(vfsp, NOT_DOWNCALL); ASSERT_VOP_LOCKED(mi->mi_rootvp, "coda_unmount"); mi->mi_rootvp->v_vflag &= ~VV_ROOT; - error = vflush(mi->mi_vfsp, 0, FORCECLOSE); + error = vflush(mi->mi_vfsp, 0, FORCECLOSE, td); #ifdef CODA_VERBOSE printf("coda_unmount: active = %d, vflush active %d\n", active, error); #endif @@ -280,14 +280,14 @@ * find root of cfs */ int -coda_root(vfsp, vpp) +coda_root(vfsp, vpp, td) struct mount *vfsp; struct vnode **vpp; + struct thread *td; { struct coda_mntinfo *mi = vftomi(vfsp); struct vnode **result; int error; - struct thread *td = curthread; /* XXX - bnoble */ struct proc *p = td->td_proc; CodaFid VFid; static const CodaFid invalfid = INVAL_FID; ==== //depot/projects/netperf_socket/sys/conf/files#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.928 2004/07/10 23:47:18 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.929 2004/07/12 11:52:14 dfr Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1241,7 +1241,7 @@ net/if_ethersubr.c optional ether net/if_faith.c optional faith net/if_fddisubr.c optional fddi -net/if_fwsubr.c optional firewire +net/if_fwsubr.c optional fwip net/if_gif.c optional gif net/if_gre.c optional gre net/if_iso88025subr.c optional token ==== //depot/projects/netperf_socket/sys/ddb/db_command.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.54 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.55 2004/07/12 01:38:07 marcel Exp $"); #include #include @@ -67,6 +67,7 @@ SET_DECLARE(db_show_cmd_set, struct command); static db_cmdfcn_t db_fncall; +static db_cmdfcn_t db_gdb; static db_cmdfcn_t db_kill; static db_cmdfcn_t db_reset; static db_cmdfcn_t db_watchdog; @@ -414,6 +415,7 @@ { "call", db_fncall, CS_OWN, 0 }, { "show", 0, 0, db_show_cmds }, { "ps", db_ps, 0, 0 }, + { "gdb", db_gdb, 0, 0 }, { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { "watchdog", db_watchdog, 0, 0 }, @@ -611,3 +613,13 @@ EVENTHANDLER_INVOKE(watchdog_list, 0, &i); } + +static void +db_gdb(db_expr_t dummy1, boolean_t dummy2, db_expr_t dummy3, char *dummy4) +{ + + if (kdb_dbbe_select("gdb") != 0) + db_printf("The remote GDB backend could not be selected.\n"); + else + db_printf("Step to enter the remote GDB backend.\n"); +} ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.214 2004/06/22 11:18:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.215 2004/07/12 10:50:49 sos Exp $"); #include "opt_ata.h" #include @@ -183,6 +183,13 @@ if (!dev || !(ch = device_get_softc(dev)) || !ch->r_irq) return ENXIO; + /* mark devices on this channel as detaching */ + ch->device[MASTER].flags |= ATA_D_DETACHING; + ch->device[SLAVE].flags |= ATA_D_DETACHING; + + /* fail outstanding requests on this channel */ + ata_fail_requests(ch, NULL); + /* detach devices on this channel */ if (ch->device[MASTER].detach) ch->device[MASTER].detach(&ch->device[MASTER]); @@ -192,9 +199,6 @@ atapi_cam_detach_bus(ch); #endif - /* fail outstanding requests on this channel */ - ata_fail_requests(ch, NULL); - /* flush cache and powerdown device */ if (ch->device[MASTER].param) { if (ch->device[MASTER].param->support.command2 & ATA_SUPPORT_FLUSHCACHE) @@ -285,18 +289,6 @@ ch->device[SLAVE].attach(&ch->device[SLAVE]); } - /* restore device config and transfermode on devices */ - if (ch->devices & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) { - if (ch->device[MASTER].config) - ch->device[MASTER].config(&ch->device[MASTER]); - ch->device[MASTER].setmode(&ch->device[MASTER],ch->device[MASTER].mode); - } - if (ch->devices & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE)) { - if (ch->device[SLAVE].config) - ch->device[SLAVE].config(&ch->device[SLAVE]); - ch->device[SLAVE].setmode(&ch->device[SLAVE], ch->device[SLAVE].mode); - } - #ifdef DEV_ATAPICAM atapi_cam_reinit_bus(ch); #endif @@ -632,6 +624,7 @@ if (ata_getparam(&ch->device[SLAVE], ATA_ATAPI_IDENTIFY)) ch->devices &= ~ATA_ATAPI_SLAVE; else { + ata_controlcmd(&ch->device[SLAVE], ATA_ATAPI_RESET, 0, 0, 0); switch (ch->device[SLAVE].param->config & ATA_ATAPI_TYPE_MASK) { #ifdef DEV_ATAPICD case ATA_ATAPI_TYPE_CDROM: @@ -663,6 +656,7 @@ if (ata_getparam(&ch->device[MASTER], ATA_ATAPI_IDENTIFY)) ch->devices &= ~ATA_ATAPI_MASTER; else { + ata_controlcmd(&ch->device[MASTER], ATA_ATAPI_RESET, 0, 0, 0); switch (ch->device[MASTER].param->config & ATA_ATAPI_TYPE_MASK) { #ifdef DEV_ATAPICD case ATA_ATAPI_TYPE_CDROM: ==== //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.173 2004/06/22 11:18:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.174 2004/07/12 10:50:50 sos Exp $"); #include "opt_ata.h" #include @@ -160,7 +160,6 @@ { struct ad_softc *adp = atadev->softc; - atadev->flags |= ATA_D_DETACHING; #ifdef DEV_ATARAID if (adp->flags & AD_F_RAID_SUBDISK) ata_raiddisk_detach(adp); ==== //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.31 2003/06/12 20:48:36 phk Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.32 2004/07/12 08:14:05 alfred Exp $ */ #include "opt_devfs.h" @@ -101,7 +101,7 @@ fmp->dm_basedir = fmp->dm_rootdir; devfs_rules_newmount(fmp, td); - error = devfs_root(mp, &rvp); + error = devfs_root(mp, &rvp, td); if (error) { lockdestroy(&fmp->dm_lock); FREE(fmp, M_DEVFS); @@ -130,7 +130,7 @@ if (mntflags & MNT_FORCE) flags |= FORCECLOSE; /* There is 1 extra root vnode reference from devfs_mount(). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); devfs_purge(fmp->dm_rootdir); @@ -144,16 +144,15 @@ /* Return locked reference to root. */ static int -devfs_root(mp, vpp) +devfs_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { int error; - struct thread *td; struct vnode *vp; struct devfs_mount *dmp; - td = curthread; /* XXX */ dmp = VFSTODEVFS(mp); error = devfs_allocv(dmp->dm_rootdir, mp, &vp, td); if (error) ==== //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc.h 8.5 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc.h,v 1.17 2004/04/07 20:45:59 imp Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc.h,v 1.18 2004/07/12 08:14:05 alfred Exp $ */ #ifdef _KERNEL @@ -58,8 +58,8 @@ #define VFSTOFDESC(mp) ((struct fdescmount *)((mp)->mnt_data)) #define VTOFDESC(vp) ((struct fdescnode *)(vp)->v_data) -extern int fdesc_init(struct vfsconf *); -extern int fdesc_root(struct mount *, struct vnode **); +extern vfs_init_t fdesc_init; +extern vfs_root_t fdesc_root; extern int fdesc_allocvp(fdntype, int, struct mount *, struct vnode **, struct thread *); #endif /* _KERNEL */ ==== //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.43 2004/04/07 20:45:59 imp Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.44 2004/07/12 08:14:05 alfred Exp $ */ /* @@ -117,7 +117,7 @@ * There is 1 extra root vnode reference corresponding * to f_root. */ - if ((error = vflush(mp, 1, flags)) != 0) + if ((error = vflush(mp, 1, flags, td)) != 0) return (error); /* @@ -130,9 +130,10 @@ } int -fdesc_root(mp, vpp) +fdesc_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct thread *td = curthread; /* XXX */ struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.36 2004/06/16 09:47:03 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.37 2004/07/12 08:14:06 alfred Exp $ */ @@ -300,7 +300,7 @@ goto failed; } - error = hpfs_root(mp, &vp); + error = hpfs_root(mp, &vp, td); if (error) { hpfs_cpdeinit(hpmp); hpfs_bmdeinit(hpmp); @@ -344,7 +344,7 @@ dprintf(("hpfs_unmount: vflushing...\n")); - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); if (error) { printf("hpfs_unmount: vflush failed: %d\n",error); return (error); @@ -371,7 +371,8 @@ static int hpfs_root( struct mount *mp, - struct vnode **vpp ) + struct vnode **vpp, + struct thread *td ) { int error = 0; struct hpfsmount *hpmp = VFSTOHPFS(mp); ==== //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.122 2004/07/04 08:52:33 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.123 2004/07/12 08:14:06 alfred Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -91,7 +91,8 @@ struct iconv_functions *msdosfs_iconv = NULL; -static int update_mp(struct mount *mp, struct msdosfs_args *argp); +static int update_mp(struct mount *mp, struct msdosfs_args *argp, + struct thread *td); static int mountmsdosfs(struct vnode *devvp, struct mount *mp, struct thread *td, struct msdosfs_args *argp); static vfs_fhtovp_t msdosfs_fhtovp; @@ -103,9 +104,10 @@ static vfs_vptofh_t msdosfs_vptofh; static int -update_mp(mp, argp) +update_mp(mp, argp, td) struct mount *mp; struct msdosfs_args *argp; + struct thread *td; { struct msdosfsmount *pmp = VFSTOMSDOSFS(mp); int error; @@ -139,7 +141,7 @@ if (FAT32(pmp)) pmp->pm_flags |= MSDOSFSMNT_LONGNAME; else { - if ((error = msdosfs_root(mp, &rootvp)) != 0) + if ((error = msdosfs_root(mp, &rootvp, td)) != 0) return error; pmp->pm_flags |= findwin95(VTODE(rootvp)) ? MSDOSFSMNT_LONGNAME @@ -187,7 +189,7 @@ flags = WRITECLOSE; if (mp->mnt_flag & MNT_FORCE) flags |= FORCECLOSE; - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); } if (!error && (mp->mnt_flag & MNT_RELOAD)) /* not yet implemented */ @@ -282,7 +284,7 @@ return (error); } - error = update_mp(mp, &args); + error = update_mp(mp, &args, td); if (error) { msdosfs_unmount(mp, MNT_FORCE, td); return error; @@ -674,7 +676,7 @@ flags = 0; if (mntflags & MNT_FORCE) flags |= FORCECLOSE; - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); if (error) return error; pmp = VFSTOMSDOSFS(mp); @@ -741,9 +743,10 @@ } static int -msdosfs_root(mp, vpp) +msdosfs_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct msdosfsmount *pmp = VFSTOMSDOSFS(mp); struct denode *ndep; ==== //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.58 2004/06/16 09:47:04 phk Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.59 2004/07/12 08:14:06 alfred Exp $ */ @@ -457,7 +457,7 @@ for(i=0;intm_sysvn[i]) vrele(ntmp->ntm_sysvn[i]); - if (vflush(mp, 0, 0)) + if (vflush(mp, 0, 0, td)) dprintf(("ntfs_mountfs: vflush failed\n")); out: @@ -487,7 +487,7 @@ flags |= FORCECLOSE; dprintf(("ntfs_unmount: vflushing...\n")); - error = vflush(mp, 0, flags | SKIPSYSTEM); + error = vflush(mp, 0, flags | SKIPSYSTEM, td); if (error) { printf("ntfs_unmount: vflush failed: %d\n",error); return (error); @@ -503,7 +503,7 @@ if(ntmp->ntm_sysvn[i]) vrele(ntmp->ntm_sysvn[i]); /* vflush system vnodes */ - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); if (error) printf("ntfs_unmount: vflush failed(sysnodes): %d\n",error); @@ -538,7 +538,8 @@ static int ntfs_root( struct mount *mp, - struct vnode **vpp ) + struct vnode **vpp, + struct thread *td ) { struct vnode *nvp; int error = 0; ==== //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.61 2004/07/10 21:20:11 marcel Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.62 2004/07/12 08:14:06 alfred Exp $ */ /* @@ -228,7 +228,7 @@ flags |= FORCECLOSE; /* There is 1 extra root vnode reference (nullm_rootvp). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); @@ -242,11 +242,11 @@ } static int -nullfs_root(mp, vpp) +nullfs_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { - struct thread *td = curthread; /* XXX */ struct vnode *vp; NULLFSDEBUG("nullfs_root(mp = %p, vp = %p->%p)\n", (void *)mp, ==== //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vfsops.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.32 2003/12/07 17:37:44 des Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.33 2004/07/12 08:14:06 alfred Exp $ */ #include "opt_ncp.h" #ifndef NCP @@ -208,7 +208,7 @@ /* protect against invalid mount points */ nmp->m.mount_point[sizeof(nmp->m.mount_point)-1] = '\0'; vfs_getnewfsid(mp); - error = nwfs_root(mp, &vp); + error = nwfs_root(mp, &vp, td); if (error) goto bad; /* @@ -238,7 +238,7 @@ if (mntflags & MNT_FORCE) flags |= FORCECLOSE; /* There is 1 extra root vnode reference from nwfs_mount(). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); conn = NWFSTOCONN(nmp); @@ -257,13 +257,12 @@ /* Return locked vnode to root of a filesystem */ static int -nwfs_root(struct mount *mp, struct vnode **vpp) { +nwfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) { struct vnode *vp; struct nwmount *nmp; struct nwnode *np; struct ncp_conn *conn; struct nw_entry_info fattr; - struct thread *td = curthread; struct ucred *cred = td->td_ucred; int error, nsf, opt; u_char vol; ==== //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.48 2004/04/07 20:46:01 imp Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.49 2004/07/12 08:14:06 alfred Exp $ */ /* @@ -170,7 +170,7 @@ return (EBUSY); #endif /* There is 1 extra root vnode reference (pm_root). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); @@ -194,9 +194,10 @@ } static int -portal_root(mp, vpp) +portal_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct thread *td = curthread; /* XXX */ struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.19 2003/12/07 17:41:19 des Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.20 2004/07/12 08:14:07 alfred Exp $ */ #include @@ -295,7 +295,7 @@ /* XXX do stuff with pi... */ - error = vflush(mp, 0, (mntflags & MNT_FORCE) ? FORCECLOSE : 0); + error = vflush(mp, 0, (mntflags & MNT_FORCE) ? FORCECLOSE : 0, td); return (error); } @@ -303,7 +303,7 @@ * Return a root vnode */ int -pfs_root(struct mount *mp, struct vnode **vpp) +pfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) { struct pfs_info *pi; ==== //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.26 2003/12/07 17:41:19 des Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.27 2004/07/12 08:14:07 alfred Exp $ */ #ifndef _PSEUDOFS_H_INCLUDED @@ -201,7 +201,8 @@ struct nameidata *ndp, struct thread *td); int pfs_unmount (struct mount *mp, int mntflags, struct thread *td); -int pfs_root (struct mount *mp, struct vnode **vpp); +int pfs_root (struct mount *mp, struct vnode **vpp, + struct thread *td); int pfs_statfs (struct mount *mp, struct statfs *sbp, struct thread *td); int pfs_init (struct pfs_info *pi, struct vfsconf *vfc); ==== //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vfsops.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.23 2003/12/07 17:37:44 des Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.24 2004/07/12 08:14:07 alfred Exp $ */ #include "opt_netsmb.h" #ifndef NETSMB @@ -189,7 +189,7 @@ /* protect against invalid mount points */ smp->sm_args.mount_point[sizeof(smp->sm_args.mount_point) - 1] = '\0'; vfs_getnewfsid(mp); - error = smbfs_root(mp, &vp); + error = smbfs_root(mp, &vp, td); if (error) goto bad; VOP_UNLOCK(vp, 0, td); @@ -238,7 +238,7 @@ do { smp->sm_didrele = 0; /* There is 1 extra root vnode reference from smbfs_mount(). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); } while (error == EBUSY && smp->sm_didrele != 0); if (error) return error; @@ -262,7 +262,7 @@ * Return locked root vnode of a filesystem */ static int -smbfs_root(struct mount *mp, struct vnode **vpp) +smbfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) { struct smbmount *smp = VFSTOSMBFS(mp); struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.18 2004/06/23 19:36:09 scottl Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.19 2004/07/12 08:14:07 alfred Exp $ */ /* udf_vfsops.c */ @@ -501,7 +501,7 @@ if (mntflags & MNT_FORCE) flags |= FORCECLOSE; - if ((error = vflush(mp, 0, flags))) + if ((error = vflush(mp, 0, flags, td))) return (error); if (udfmp->im_flags & UDFMNT_KICONV && udf_iconv) { @@ -532,7 +532,7 @@ } static int -udf_root(struct mount *mp, struct vnode **vpp) +udf_root(struct mount *mp, struct vnode **vpp, struct thread *td) { struct udf_mnt *udfmp; struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/umapfs/umap_vfsops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/umapfs/umap_vfsops.c,v 1.56 2004/04/07 20:46:02 imp Exp $ + * $FreeBSD: src/sys/fs/umapfs/umap_vfsops.c,v 1.57 2004/07/12 08:14:07 alfred Exp $ */ /* @@ -279,7 +279,7 @@ return (EBUSY); #endif /* There is 1 extra root vnode reference (umapm_rootvp). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); @@ -292,9 +292,10 @@ } static int -umapfs_root(mp, vpp) +umapfs_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct thread *td = curthread; /* XXX */ struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/unionfs/union_vfsops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.65 2004/04/07 20:46:03 imp Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.66 2004/07/12 08:14:07 alfred Exp $ */ /* @@ -342,7 +342,7 @@ * (d) times, where (d) is the maximum tree depth * in the filesystem. */ - for (freeing = 0; (error = vflush(mp, 0, flags)) != 0;) { + for (freeing = 0; (error = vflush(mp, 0, flags, td)) != 0;) { int n; /* count #vnodes held on mount list */ @@ -378,9 +378,10 @@ } static int -union_root(mp, vpp) +union_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct union_mount *um = MOUNTTOUNIONMOUNT(mp); int error; ==== //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.107 2004/04/07 20:46:03 imp Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.108 2004/07/12 08:14:07 alfred Exp $ */ #include @@ -268,7 +268,7 @@ relock_pdvp = 1; vput(dvp); dvp = NULL; - error = VFS_ROOT(mp, &dvp); + error = VFS_ROOT(mp, &dvp, td); vfs_unbusy(mp, td); ==== //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.123 2004/07/04 08:52:33 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.124 2004/07/12 08:14:08 alfred Exp $ */ #include @@ -829,7 +829,7 @@ { int error; - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); return (error); } @@ -1215,9 +1215,10 @@ * Return the root of a filesystem. */ static int -ext2_root(mp, vpp) +ext2_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct vnode *nvp; int error; ==== //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.118 2004/07/03 16:56:45 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.119 2004/07/12 08:14:08 alfred Exp $"); #include #include @@ -554,7 +554,7 @@ if (mntinvalbuf(mp)) return EBUSY; #endif - if ((error = vflush(mp, 0, flags))) + if ((error = vflush(mp, 0, flags, td))) return (error); isomp = VFSTOISOFS(mp); @@ -578,9 +578,10 @@ * Return root of a filesystem */ static int -cd9660_root(mp, vpp) +cd9660_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct iso_mnt *imp = VFSTOISOFS(mp); struct iso_directory_record *dp = ==== //depot/projects/netperf_socket/sys/kern/init_main.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.243 2004/06/16 00:26:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.244 2004/07/12 08:14:08 alfred Exp $"); #include "opt_init_path.h" #include "opt_mac.h" @@ -553,7 +553,7 @@ vfs_mountroot(); /* Get the vnode for '/'. Set p->p_fd->fd_cdir to reference it. */ - if (VFS_ROOT(TAILQ_FIRST(&mountlist), &rootvnode)) + if (VFS_ROOT(TAILQ_FIRST(&mountlist), &rootvnode, td)) panic("cannot find root vnode"); FILEDESC_LOCK(p->p_fd); p->p_fd->fd_cdir = rootvnode; ==== //depot/projects/netperf_socket/sys/kern/init_sysent.c#9 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.173 2004/07/02 00:38:55 marcel Exp $ + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.174 2004/07/12 07:39:19 davidxu Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.174 2004/07/02 00:35:52 marcel Exp */ ==== //depot/projects/netperf_socket/sys/kern/kern_exit.c#14 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.238 2004/06/21 14:49:50 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.239 2004/07/12 05:07:50 marcel Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -429,6 +429,7 @@ mtx_lock(&Giant); PROC_LOCK(p); p->p_xstat = rv; + p->p_xlwpid = td->td_tid; *p->p_ru = p->p_stats->p_ru; mtx_lock_spin(&sched_lock); calcru(p, &p->p_ru->ru_utime, &p->p_ru->ru_stime, NULL); ==== //depot/projects/netperf_socket/sys/kern/kern_kse.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.182 2004/06/26 18:58:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.183 2004/07/12 07:39:19 davidxu Exp $"); #include #include @@ -126,25 +126,36 @@ #ifndef _SYS_SYSPROTO_H_ struct kse_switchin_args { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 12 15:53:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE87916A4D0; Mon, 12 Jul 2004 15:53:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 89B3816A4CE for ; Mon, 12 Jul 2004 15:53:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8327143D31 for ; Mon, 12 Jul 2004 15:53:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6CFraF6022159 for ; Mon, 12 Jul 2004 15:53:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6CFraDe022156 for perforce@freebsd.org; Mon, 12 Jul 2004 15:53:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 12 Jul 2004 15:53:36 GMT Message-Id: <200407121553.i6CFraDe022156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2004 15:53:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=57193 Change 57193 by rwatson@rwatson_tislabs on 2004/07/12 15:52:50 Unifdef include of mac.h; remove gratuitous white space differences from CVS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#22 (text+ko) ==== @@ -52,9 +52,7 @@ #include #include #include -#ifdef MAC #include -#endif #include #include @@ -280,7 +278,6 @@ if (!jail_sysvipc_allowed && jailed(td->td_ucred)) return (ENOSYS); - mtx_lock(&Giant); shmmap_s = p->p_vmspace->vm_shm; if (shmmap_s == NULL) { @@ -347,7 +344,6 @@ if (!jail_sysvipc_allowed && jailed(td->td_ucred)) return (ENOSYS); - mtx_lock(&Giant); shmmap_s = p->p_vmspace->vm_shm; if (shmmap_s == NULL) { @@ -474,7 +470,6 @@ if (!jail_sysvipc_allowed && jailed(td->td_ucred)) return (ENOSYS); - mtx_lock(&Giant); shmseg = shm_find_segment_by_shmid(uap->shmid); if (shmseg == NULL) { @@ -819,7 +814,6 @@ if (!jail_sysvipc_allowed && jailed(td->td_ucred)) return (ENOSYS); - mtx_lock(&Giant); mode = uap->shmflg & ACCESSPERMS; if (uap->key != IPC_PRIVATE) { From owner-p4-projects@FreeBSD.ORG Mon Jul 12 18:27:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CDD616A4D0; Mon, 12 Jul 2004 18:27:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6856D16A4CE for ; Mon, 12 Jul 2004 18:27:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6199443D48 for ; Mon, 12 Jul 2004 18:27:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6CIRkl7026365 for ; Mon, 12 Jul 2004 18:27:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6CIRk0j026362 for perforce@freebsd.org; Mon, 12 Jul 2004 18:27:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 12 Jul 2004 18:27:46 GMT Message-Id: <200407121827.i6CIRk0j026362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2004 18:27:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=57204 Change 57204 by rwatson@rwatson_tislabs on 2004/07/12 18:26:54 Minor style tweaks. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/shm.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/shm.h#7 (text+ko) ==== @@ -85,14 +85,12 @@ }; /* - * Add a kernel wrapper to the shmid_ds struct so that private info - * (like the MAC label) can be added to it, without changing the user - * interface. + * Add a kernel wrapper to the shmid_ds struct so that private info (like the + * MAC label) can be added to it, without changing the user interface. */ struct shmid_kernel { struct shmid_ds u; - /* the following are private */ - struct label *label; /* MAC label */ + struct label *label; /* MAC label */ }; extern struct shminfo shminfo; From owner-p4-projects@FreeBSD.ORG Mon Jul 12 19:43:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90BDA16A4D0; Mon, 12 Jul 2004 19:43:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A28B16A4CE for ; Mon, 12 Jul 2004 19:43:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 603EC43D3F for ; Mon, 12 Jul 2004 19:43:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6CJhKN3029101 for ; Mon, 12 Jul 2004 19:43:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6CJhKj5029096 for perforce@freebsd.org; Mon, 12 Jul 2004 19:43:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 12 Jul 2004 19:43:20 GMT Message-Id: <200407121943.i6CJhKj5029096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2004 19:43:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=57211 Change 57211 by rwatson@rwatson_tislabs on 2004/07/12 19:42:38 Integ netperf_socket from FreeBSD CVS: - Locking fixes for umtx. - at_rmx prsockaddr() fixes for MPSAFEty (merged from rwatson_netperf). - netatalk DDP PCB locking (merged from rwatson_netperf). - Additional tcp_input() locking state assertions (merged from rwatson_netperf) - Constification in rpc, spx. Affected files ... .. //depot/projects/netperf_socket/sys/kern/kern_thr.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/aarp.c#9 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_rmx.c#3 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#6 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#7 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#11 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_var.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#8 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#8 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/kern_thr.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.21 2004/07/02 00:40:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.22 2004/07/12 15:28:31 mtm Exp $"); #include #include @@ -280,13 +280,10 @@ hz = tvtohz(&tv); } PROC_LOCK(td->td_proc); - mtx_lock_spin(&sched_lock); - if ((td->td_flags & TDF_THRWAKEUP) == 0) { - mtx_unlock_spin(&sched_lock); + if ((td->td_flags & TDF_THRWAKEUP) == 0) error = msleep((void *)td, &td->td_proc->p_mtx, td->td_priority | PCATCH, "lthr", hz); - mtx_lock_spin(&sched_lock); - } + mtx_lock_spin(&sched_lock); td->td_flags &= ~TDF_THRWAKEUP; mtx_unlock_spin(&sched_lock); PROC_UNLOCK(td->td_proc); ==== //depot/projects/netperf_socket/sys/kern/kern_umtx.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.15 2004/07/02 00:40:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.16 2004/07/12 15:28:31 mtm Exp $"); #include #include @@ -217,14 +217,12 @@ * unlocking the umtx. */ PROC_LOCK(td->td_proc); - mtx_lock_spin(&sched_lock); - if (old == owner && (td->td_flags & TDF_UMTXWAKEUP) == 0) { - mtx_unlock_spin(&sched_lock); + if (old == owner && (td->td_flags & TDF_UMTXWAKEUP) == 0) error = msleep(td, &td->td_proc->p_mtx, td->td_priority | PCATCH, "umtx", 0); - mtx_lock_spin(&sched_lock); - } else + else error = 0; + mtx_lock_spin(&sched_lock); td->td_flags &= ~TDF_UMTXWAKEUP; mtx_unlock_spin(&sched_lock); PROC_UNLOCK(td->td_proc); ==== //depot/projects/netperf_socket/sys/netatalk/aarp.c#9 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/aarp.c,v 1.31 2004/04/25 09:24:51 luigi Exp $ + * $FreeBSD: src/sys/netatalk/aarp.c,v 1.32 2004/07/12 18:35:30 rwatson Exp $ */ #include "opt_atalk.h" @@ -71,9 +71,6 @@ 0x09, 0x00, 0x07, 0xff, 0xff, 0xff, }; -/* - * Not used? - */ u_char at_org_code[ 3 ] = { 0x08, 0x00, 0x07, }; ==== //depot/projects/netperf_socket/sys/netatalk/at_rmx.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * at_rmx.c,v 1.13 1995/05/30 08:09:31 rgrimes Exp - * $FreeBSD: src/sys/netatalk/at_rmx.c,v 1.7 2004/03/22 03:57:01 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/at_rmx.c,v 1.8 2004/07/12 18:37:31 rwatson Exp $ */ /* This code generates debugging traces to the radix code */ @@ -40,10 +40,10 @@ int at_inithead(void **head, int off); -static char hexbuf[256]; +#define HEXBUF_LEN 256 -static char * -prsockaddr(void *v) +static const char * +prsockaddr(void *v, char *hexbuf) { char *bp = &hexbuf[0]; u_char *cp = v; @@ -55,7 +55,7 @@ /* return: "(len) hexdump" */ bp += sprintf(bp, "(%d)", len); - for (cp++; cp < cplim && bp < hexbuf+252; cp++) { + for (cp++; cp < cplim && bp < hexbuf + (HEXBUF_LEN - 4); cp++) { *bp++ = "0123456789abcdef"[*cp / 16]; *bp++ = "0123456789abcdef"[*cp % 16]; } @@ -63,8 +63,7 @@ bp+= sprintf(bp, "null"); } *bp = '\0'; - - return &hexbuf[0]; + return (hexbuf); } static struct radix_node * @@ -72,9 +71,10 @@ struct radix_node *treenodes) { struct radix_node *rn; + char hexbuf[HEXBUF_LEN]; - printf("at_addroute: v=%s\n", prsockaddr(v_arg)); - printf("at_addroute: n=%s\n", prsockaddr(n_arg)); + printf("at_addroute: v=%s\n", prsockaddr(v_arg, hexbuf)); + printf("at_addroute: n=%s\n", prsockaddr(n_arg, hexbuf)); printf("at_addroute: head=%p treenodes=%p\n", (void *)head, (void *)treenodes); @@ -89,8 +89,9 @@ at_matroute(void *v_arg, struct radix_node_head *head) { struct radix_node *rn; + char hexbuf[HEXBUF_LEN]; - printf("at_matroute: v=%s\n", prsockaddr(v_arg)); + printf("at_matroute: v=%s\n", prsockaddr(v_arg, hexbuf)); printf("at_matroute: head=%p\n", (void *)head); rn = rn_match(v_arg, head); @@ -104,9 +105,10 @@ at_lookup(void *v_arg, void *m_arg, struct radix_node_head *head) { struct radix_node *rn; + char hexbuf[HEXBUF_LEN]; - printf("at_lookup: v=%s\n", prsockaddr(v_arg)); - printf("at_lookup: n=%s\n", prsockaddr(m_arg)); + printf("at_lookup: v=%s\n", prsockaddr(v_arg, hexbuf)); + printf("at_lookup: n=%s\n", prsockaddr(m_arg, hexbuf)); printf("at_lookup: head=%p\n", (void *)head); rn = rn_lookup(v_arg, m_arg, head); @@ -120,9 +122,10 @@ at_delroute(void *v_arg, void *netmask_arg, struct radix_node_head *head) { struct radix_node *rn; + char hexbuf[HEXBUF_LEN]; - printf("at_delroute: v=%s\n", prsockaddr(v_arg)); - printf("at_delroute: n=%s\n", prsockaddr(netmask_arg)); + printf("at_delroute: v=%s\n", prsockaddr(v_arg, hexbuf)); + printf("at_delroute: n=%s\n", prsockaddr(netmask_arg, hexbuf)); printf("at_delroute: head=%p\n", (void *)head); rn = rn_delete(v_arg, netmask_arg, head); ==== //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#6 (text+ko) ==== @@ -1,8 +1,9 @@ /* + * Copyright (c) 2004 Robert N. M. Watson * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.24 2004/06/13 02:50:05 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.25 2004/07/12 18:39:59 rwatson Exp $ */ #include "opt_mac.h" @@ -24,11 +25,13 @@ #include #include #include +#include #include static volatile int ddp_forward = 1; static volatile int ddp_firewall = 0; static struct ddpstat ddpstat; + static struct route forwro; static void ddp_input(struct mbuf *, struct ifnet *, struct elaphdr *, int); @@ -360,17 +363,16 @@ * Search for ddp protocol control blocks that match these * addresses. */ + DDP_LIST_SLOCK(); if ((ddp = ddp_search(&from, &to, aa)) == NULL) { - m_freem(m); - return; + goto out; } #ifdef MAC SOCK_LOCK(ddp->ddp_socket); if (mac_check_socket_deliver(ddp->ddp_socket, m) != 0) { SOCK_UNLOCK(ddp->ddp_socket); - m_freem(m); - return; + goto out; } SOCK_UNLOCK(ddp->ddp_socket); #endif @@ -384,13 +386,17 @@ * If the socket is full (or similar error) dump the packet. */ ddpstat.ddps_nosockspace++; - m_freem(m); - return; + goto out; } /* * And wake up whatever might be waiting for it */ sorwakeup(ddp->ddp_socket); + m = NULL; +out: + DDP_LIST_SUNLOCK(); + if (m != NULL) + m_freem(m); } #if 0 ==== //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#7 (text+ko) ==== @@ -1,8 +1,9 @@ /* + * Copyright (c) 2004 Robert N. M. Watson * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.43 2004/06/12 20:47:29 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.44 2004/07/12 18:39:59 rwatson Exp $ */ #include @@ -22,12 +23,18 @@ #include #include +struct mtx ddp_list_mtx; static struct ddpcb *ddp_ports[ ATPORT_LAST ]; -struct ddpcb *ddpcb_list = NULL; +struct ddpcb *ddpcb_list = NULL; void at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr) { + + /* + * Prevent modification of ddp during copy of addr. + */ + DDP_LOCK_ASSERT(ddp); *addr = sodupsockaddr((struct sockaddr *)&ddp->ddp_lsat, M_NOWAIT); } @@ -38,6 +45,12 @@ struct at_ifaddr *aa; struct ddpcb *ddpp; + /* + * We read and write both the ddp passed in, and also ddp_ports. + */ + DDP_LIST_XLOCK_ASSERT(); + DDP_LOCK_ASSERT(ddp); + if (ddp->ddp_lsat.sat_port != ATADDR_ANYPORT) { /* shouldn't be bound */ return (EINVAL); } @@ -134,6 +147,9 @@ struct ifnet *ifp; u_short hintnet = 0, net; + DDP_LIST_XLOCK_ASSERT(); + DDP_LOCK_ASSERT(ddp); + if (sat->sat_family != AF_APPLETALK) { return (EAFNOSUPPORT); } @@ -222,6 +238,9 @@ void at_pcbdisconnect(struct ddpcb *ddp) { + + DDP_LOCK_ASSERT(ddp); + ddp->ddp_fsat.sat_addr.s_net = ATADDR_ANYNET; ddp->ddp_fsat.sat_addr.s_node = ATADDR_ANYNODE; ddp->ddp_fsat.sat_port = ATADDR_ANYPORT; @@ -232,9 +251,15 @@ { struct ddpcb *ddp; - MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO); + DDP_LIST_XLOCK_ASSERT(); + + MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_NOWAIT | M_ZERO); + DDP_LOCK_INIT(ddp); ddp->ddp_lsat.sat_port = ATADDR_ANYPORT; + ddp->ddp_socket = so; + so->so_pcb = (caddr_t)ddp; + ddp->ddp_next = ddpcb_list; ddp->ddp_prev = NULL; ddp->ddp_pprev = NULL; @@ -243,15 +268,19 @@ ddpcb_list->ddp_prev = ddp; } ddpcb_list = ddp; - - ddp->ddp_socket = so; - so->so_pcb = (caddr_t)ddp; - return (0); + return(0); } void at_pcbdetach(struct socket *so, struct ddpcb *ddp) { + + /* + * We modify ddp, ddp_ports, and the global list. + */ + DDP_LIST_XLOCK_ASSERT(); + DDP_LOCK_ASSERT(ddp); + soisdisconnected(so); SOCK_LOCK(so); so->so_pcb = NULL; @@ -282,6 +311,8 @@ if (ddp->ddp_next) { ddp->ddp_next->ddp_prev = ddp->ddp_prev; } + DDP_UNLOCK(ddp); + DDP_LOCK_DESTROY(ddp); FREE(ddp, M_PCB); } @@ -297,6 +328,8 @@ { struct ddpcb *ddp; + DDP_LIST_SLOCK_ASSERT(); + /* * Check for bad ports. */ @@ -309,11 +342,13 @@ * the interface? */ for (ddp = ddp_ports[ to->sat_port - 1 ]; ddp; ddp = ddp->ddp_pnext) { + DDP_LOCK(ddp); /* XXX should we handle 0.YY? */ /* XXXX.YY to socket on destination interface */ if (to->sat_addr.s_net == ddp->ddp_lsat.sat_addr.s_net && to->sat_addr.s_node == ddp->ddp_lsat.sat_addr.s_node) { + DDP_UNLOCK(ddp); break; } @@ -321,6 +356,7 @@ if (to->sat_addr.s_node == ATADDR_BCAST && (to->sat_addr.s_net == 0 || to->sat_addr.s_net == ddp->ddp_lsat.sat_addr.s_net) && ddp->ddp_lsat.sat_addr.s_net == AA_SAT(aa)->sat_addr.s_net) { + DDP_UNLOCK(ddp); break; } @@ -331,8 +367,10 @@ ntohs(aa->aa_firstnet) && ntohs(ddp->ddp_lsat.sat_addr.s_net) <= ntohs(aa->aa_lastnet)) { + DDP_UNLOCK(ddp); break; } + DDP_UNLOCK(ddp); } return (ddp); } ==== //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.h#2 (text+ko) ==== @@ -1,8 +1,9 @@ /* + * Copyright (c) 2004 Robert N. M. Watson * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_pcb.h,v 1.1 2004/03/19 07:21:22 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_pcb.h,v 1.2 2004/07/12 18:39:59 rwatson Exp $ */ #ifndef _NETATALK_DDP_PCB_H_ @@ -17,4 +18,23 @@ struct thread *td); void at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr); +/* Lock macros for per-pcb locks. */ +#define DDP_LOCK_INIT(ddp) mtx_init(&(ddp)->ddp_mtx, "ddp_mtx", \ + NULL, MTX_DEF) +#define DDP_LOCK_DESTROY(ddp) mtx_destroy(&(ddp)->ddp_mtx) +#define DDP_LOCK(ddp) mtx_lock(&(ddp)->ddp_mtx) +#define DDP_UNLOCK(ddp) mtx_unlock(&(ddp)->ddp_mtx) +#define DDP_LOCK_ASSERT(ddp) mtx_assert(&(ddp)->ddp_mtx, MA_OWNED) + +/* Lock macros for global pcb list lock. */ +#define DDP_LIST_LOCK_INIT() mtx_init(&ddp_list_mtx, "ddp_list_mtx", \ + NULL, MTX_DEF) +#define DDP_LIST_LOCK_DESTROY() mtx_destroy(&ddp_list_mtx) +#define DDP_LIST_XLOCK() mtx_lock(&ddp_list_mtx) +#define DDP_LIST_XUNLOCK() mtx_unlock(&ddp_list_mtx) +#define DDP_LIST_XLOCK_ASSERT() mtx_assert(&ddp_list_mtx, MA_OWNED) +#define DDP_LIST_SLOCK() mtx_lock(&ddp_list_mtx) +#define DDP_LIST_SUNLOCK() mtx_unlock(&ddp_list_mtx) +#define DDP_LIST_SLOCK_ASSERT() mtx_assert(&ddp_list_mtx, MA_OWNED) + #endif ==== //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#11 (text+ko) ==== @@ -1,8 +1,9 @@ /* + * Copyright (c) 2004 Robert N. M. Watson * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.41 2004/07/12 04:33:58 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.42 2004/07/12 18:39:59 rwatson Exp $ */ #include @@ -33,17 +34,22 @@ struct ddpcb *ddp; int error = 0; + ddp = sotoddpcb(so); + if (ddp != NULL) + return (EINVAL); - ddp = sotoddpcb(so); - if (ddp != NULL) { - return (EINVAL); - } + /* + * Allocate socket buffer space first so that it's present + * before first use. + */ + error = soreserve(so, ddp_sendspace, ddp_recvspace); + if (error) + return (error); + DDP_LIST_XLOCK(); error = at_pcballoc(so); - if (error) { - return (error); - } - return (soreserve(so, ddp_sendspace, ddp_recvspace)); + DDP_LIST_XUNLOCK(); + return (error); } static int @@ -52,10 +58,13 @@ struct ddpcb *ddp; ddp = sotoddpcb(so); - if (ddp == NULL) { + if (ddp == NULL) return (EINVAL); - } + + DDP_LIST_XLOCK(); + DDP_LOCK(ddp); at_pcbdetach(so, ddp); + DDP_LIST_XUNLOCK(); return (0); } @@ -69,7 +78,11 @@ if (ddp == NULL) { return (EINVAL); } + DDP_LIST_XLOCK(); + DDP_LOCK(ddp); error = at_pcbsetaddr(ddp, nam, td); + DDP_UNLOCK(ddp); + DDP_LIST_XUNLOCK(); return (error); } @@ -84,11 +97,17 @@ return (EINVAL); } + DDP_LIST_XLOCK(); + DDP_LOCK(ddp); if (ddp->ddp_fsat.sat_port != ATADDR_ANYPORT) { + DDP_UNLOCK(ddp); + DDP_LIST_XUNLOCK(); return (EISCONN); } - error = at_pcbconnect(ddp, nam, td); + error = at_pcbconnect( ddp, nam, td ); + DDP_UNLOCK(ddp); + DDP_LIST_XUNLOCK(); if (error == 0) soisconnected(so); return (error); @@ -104,12 +123,15 @@ if (ddp == NULL) { return (EINVAL); } + DDP_LOCK(ddp); if (ddp->ddp_fsat.sat_addr.s_node == ATADDR_ANYNODE) { + DDP_UNLOCK(ddp); return (ENOTCONN); } at_pcbdisconnect(ddp); ddp->ddp_fsat.sat_addr.s_node = ATADDR_ANYNODE; + DDP_UNLOCK(ddp); soisdisconnected(so); return (0); } @@ -144,23 +166,28 @@ } if (addr != NULL) { + DDP_LIST_XLOCK(); + DDP_LOCK(ddp); if (ddp->ddp_fsat.sat_port != ATADDR_ANYPORT) { - return (EISCONN); + error = EISCONN; + goto out; } error = at_pcbconnect(ddp, addr, td); - if (error) { - return (error); + if (error == 0) { + error = ddp_output(m, so); + at_pcbdisconnect(ddp); } +out: + DDP_UNLOCK(ddp); + DDP_LIST_XUNLOCK(); } else { - if (ddp->ddp_fsat.sat_port == ATADDR_ANYPORT) { - return (ENOTCONN); - } - } - - error = ddp_output(m, so); - if (addr != NULL) { - at_pcbdisconnect(ddp); + DDP_LOCK(ddp); + if (ddp->ddp_fsat.sat_port == ATADDR_ANYPORT) + error = ENOTCONN; + else + error = ddp_output(m, so); + DDP_UNLOCK(ddp); } return (error); } @@ -174,20 +201,23 @@ if (ddp == NULL) { return (EINVAL); } + DDP_LIST_XLOCK(); + DDP_LOCK(ddp); at_pcbdetach(so, ddp); + DDP_LIST_XUNLOCK(); return (0); } void ddp_init(void) { - atintrq1.ifq_maxlen = IFQ_MAXLEN; atintrq2.ifq_maxlen = IFQ_MAXLEN; aarpintrq.ifq_maxlen = IFQ_MAXLEN; mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF); mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF); mtx_init(&aarpintrq.ifq_mtx, "aarp_inq", NULL, MTX_DEF); + DDP_LIST_LOCK_INIT(); netisr_register(NETISR_ATALK1, at1intr, &atintrq1, 0); netisr_register(NETISR_ATALK2, at2intr, &atintrq2, 0); netisr_register(NETISR_AARP, aarpintr, &aarpintrq, 0); @@ -202,6 +232,7 @@ for (ddp = ddpcb_list; ddp != NULL; ddp = ddp->ddp_next) { at_pcbdetach(ddp->ddp_socket, ddp); } + DDP_LIST_LOCK_DESTROY(); } #endif @@ -220,7 +251,9 @@ if (ddp == NULL) { return (EINVAL); } + DDP_LOCK(ddp); at_sockaddr(ddp, nam); + DDP_UNLOCK(ddp); return (0); } ==== //depot/projects/netperf_socket/sys/netatalk/ddp_var.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.6 2004/03/22 04:54:36 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.7 2004/07/12 18:39:59 rwatson Exp $ */ #ifndef _NETATALK_DDP_VAR_H_ @@ -13,6 +13,7 @@ struct socket *ddp_socket; struct ddpcb *ddp_prev, *ddp_next; struct ddpcb *ddp_pprev, *ddp_pnext; + struct mtx ddp_mtx; }; #define sotoddpcb(so) ((struct ddpcb *)(so)->so_pcb) @@ -34,5 +35,6 @@ extern int ddp_cksum; extern struct ddpcb *ddpcb_list; extern struct pr_usrreqs ddp_usrreqs; +extern struct mtx ddp_list_mtx; #endif #endif /* _NETATALK_DDP_VAR_H_ */ ==== //depot/projects/netperf_socket/sys/netinet/tcp_input.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.249 2004/07/01 23:34:06 jayanth Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.250 2004/07/12 19:28:07 rwatson Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -985,6 +985,8 @@ goto drop; } after_listen: + KASSERT(headlocked, ("tcp_input(): after_listen head is not locked")); + INP_LOCK_ASSERT(inp); /* XXX temp debugging */ /* should not happen - syncache should pick up these connections */ @@ -1474,6 +1476,10 @@ } trimthenstep6: + KASSERT(headlocked, + ("tcp_input(): trimthenstep6 head is not locked")); + INP_LOCK_ASSERT(inp); + /* * Advance th->th_seq to correspond to first data byte. * If data, trim to stay within window, @@ -2083,6 +2089,10 @@ } process_ACK: + KASSERT(headlocked, + ("tcp_input(): process_ACK head is not locked")); + INP_LOCK_ASSERT(inp); + acked = th->th_ack - tp->snd_una; tcpstat.tcps_rcvackpack++; tcpstat.tcps_rcvackbyte += acked; @@ -2263,6 +2273,9 @@ } step6: + KASSERT(headlocked, ("tcp_input(): step6 head is not locked")); + INP_LOCK_ASSERT(inp); + /* * Update window information. * Don't look at window if no ACK: TAC's send garbage on first SYN. @@ -2345,7 +2358,9 @@ tp->rcv_up = tp->rcv_nxt; } dodata: /* XXX */ - KASSERT(headlocked, ("headlocked")); + KASSERT(headlocked, ("tcp_input(): dodata head is not locked")); + INP_LOCK_ASSERT(inp); + /* * Process the segment text, merging it into the TCP sequencing queue, * and arranging for acknowledgment of receipt if necessary. @@ -2481,6 +2496,7 @@ (void) tcp_output(tp); check_delack: + INP_LOCK_ASSERT(inp); if (tp->t_flags & TF_DELACK) { tp->t_flags &= ~TF_DELACK; callout_reset(tp->tt_delack, tcp_delacktime, ==== //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.45 2004/06/24 04:29:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.46 2004/07/12 19:35:29 rwatson Exp $"); #include #include @@ -77,7 +77,7 @@ #define spxstat spx_istat.newstats #endif -static int spx_backoff[SPX_MAXRXTSHIFT+1] = +static const int spx_backoff[SPX_MAXRXTSHIFT+1] = { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 }; static struct spxpcb *spx_close(struct spxpcb *cb); ==== //depot/projects/netperf_socket/sys/rpc/rpcclnt.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.9 2004/03/28 05:55:27 kan Exp $ */ +/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.10 2004/07/12 19:37:08 rwatson Exp $ */ /* $Id: rpcclnt.c,v 1.9 2003/11/05 14:59:03 rees Exp $ */ /* @@ -141,7 +141,7 @@ */ #define RPC_CWNDSCALE 256 #define RPC_MAXCWND (RPC_CWNDSCALE * 32) -static int rpcclnt_backoff[8] = {2, 4, 8, 16, 32, 64, 128, 256,}; +static const int rpcclnt_backoff[8] = {2, 4, 8, 16, 32, 64, 128, 256,}; /* XXX ugly debug strings */ #define RPC_ERRSTR_ACCEPTED_SIZE 6 ==== //depot/projects/netperf_socket/sys/vm/vm_pageout.c#8 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.258 2004/06/24 04:08:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.259 2004/07/12 17:45:37 alc Exp $"); #include "opt_vm.h" #include @@ -148,7 +148,7 @@ static int vm_max_launder = 32; static int vm_pageout_stats_max=0, vm_pageout_stats_interval = 0; static int vm_pageout_full_stats_interval = 0; -static int vm_pageout_stats_free_max=0, vm_pageout_algorithm=0; +static int vm_pageout_algorithm=0; static int defer_swap_pageouts=0; static int disable_swap_pageouts=0; @@ -175,9 +175,6 @@ SYSCTL_INT(_vm, OID_AUTO, pageout_stats_interval, CTLFLAG_RW, &vm_pageout_stats_interval, 0, "Interval for partial stats scan"); -SYSCTL_INT(_vm, OID_AUTO, pageout_stats_free_max, - CTLFLAG_RW, &vm_pageout_stats_free_max, 0, "Not implemented"); - #if defined(NO_SWAPPING) SYSCTL_INT(_vm, VM_SWAPPING_ENABLED, swap_enabled, CTLFLAG_RD, &vm_swap_enabled, 0, ""); @@ -1390,12 +1387,6 @@ if (vm_pageout_full_stats_interval == 0) vm_pageout_full_stats_interval = vm_pageout_stats_interval * 4; - /* - * Set maximum free per pass - */ - if (vm_pageout_stats_free_max == 0) - vm_pageout_stats_free_max = 5; - swap_pager_swap_init(); pass = 0; /* From owner-p4-projects@FreeBSD.ORG Tue Jul 13 22:37:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE8C016A4D2; Tue, 13 Jul 2004 22:37:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 687E316A4CE for ; Tue, 13 Jul 2004 22:37:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AB4643D1D for ; Tue, 13 Jul 2004 22:37:36 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6DMba1h079476 for ; Tue, 13 Jul 2004 22:37:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6DMbSXF079473 for perforce@freebsd.org; Tue, 13 Jul 2004 22:37:28 GMT (envelope-from peter@freebsd.org) Date: Tue, 13 Jul 2004 22:37:28 GMT Message-Id: <200407132237.i6DMbSXF079473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2004 22:37:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=57302 Change 57302 by peter@peter_hammer on 2004/07/13 22:37:19 IFC @57297 Affected files ... .. //depot/projects/hammer/Makefile#19 integrate .. //depot/projects/hammer/Makefile.inc1#54 integrate .. //depot/projects/hammer/UPDATING#45 integrate .. //depot/projects/hammer/bin/csh/config.h#2 integrate .. //depot/projects/hammer/bin/expr/expr.1#5 integrate .. //depot/projects/hammer/contrib/ngatm/libngatm/cccust.h#1 branch .. //depot/projects/hammer/contrib/ngatm/libngatm/sscfucust.h#2 integrate .. //depot/projects/hammer/contrib/ngatm/libngatm/sscopcust.h#2 integrate .. //depot/projects/hammer/contrib/ngatm/libngatm/unimsg.c#2 integrate .. //depot/projects/hammer/contrib/ngatm/man/libngatm.3#2 integrate .. //depot/projects/hammer/contrib/ngatm/man/uniaddr.3#2 integrate .. //depot/projects/hammer/contrib/ngatm/man/unifunc.3#2 integrate .. //depot/projects/hammer/contrib/ngatm/man/unisap.3#1 branch .. //depot/projects/hammer/contrib/ngatm/man/unistruct.3#2 integrate .. //depot/projects/hammer/contrib/ngatm/sscop/common.c#2 integrate .. //depot/projects/hammer/contrib/ngatm/sscop/common.h#2 integrate .. //depot/projects/hammer/contrib/ngatm/sscop/sscop.1#2 integrate .. //depot/projects/hammer/contrib/ngatm/sscop/sscop_main.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/FAQ#2 integrate .. //depot/projects/hammer/contrib/tcsh/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/tcsh/Fixes#2 integrate .. //depot/projects/hammer/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/hammer/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/tcsh/README#2 integrate .. //depot/projects/hammer/contrib/tcsh/WishList#2 integrate .. //depot/projects/hammer/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/hammer/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/hammer/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/configure#2 integrate .. //depot/projects/hammer/contrib/tcsh/configure.in#2 integrate .. //depot/projects/hammer/contrib/tcsh/csh-mode.el#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/glob.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/glob.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/host.defs#2 integrate .. //depot/projects/hammer/contrib/tcsh/ma.setp.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/C/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/Makefile#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/et/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/finnish/set14#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/finnish/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/french/set11#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/french/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/german/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/greek/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/italian/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/ja/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/spanish/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/hammer/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.set.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/hammer/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/hammer/contrib/top/commands.c#3 integrate .. //depot/projects/hammer/contrib/top/top.X#4 integrate .. //depot/projects/hammer/contrib/top/top.c#4 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#21 integrate .. //depot/projects/hammer/etc/services#10 integrate .. //depot/projects/hammer/games/bcd/Makefile#2 integrate .. //depot/projects/hammer/games/bcd/bcd.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#10 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile.inc#3 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile.inc0#7 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#7 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#3 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/amd64-freebsd/config.h#3 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/config.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#3 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/i386-freebsd/config.h#7 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile#4 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#7 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/powerpc-freebsd/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#6 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/sparc64-freebsd/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#7 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.alpha#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#8 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.i386#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.ia64#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.m68k#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.powerpc#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.sparc64#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.alpha#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.i386#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.ia64#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/alpha/bfd.h#5 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/amd64/bfd.h#3 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/bfd.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/i386/bfd.h#7 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#5 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#5 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/sparc64/bfd.h#5 delete .. //depot/projects/hammer/include/regex.h#4 integrate .. //depot/projects/hammer/include/strings.h#4 integrate .. //depot/projects/hammer/include/wctype.h#4 integrate .. //depot/projects/hammer/lib/libarchive/README#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#14 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/isinf.c#4 delete .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#14 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/isinf.c#6 delete .. //depot/projects/hammer/lib/libc/arm/gen/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/arm/gen/isinf.c#2 delete .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#15 integrate .. //depot/projects/hammer/lib/libc/gen/fpclassify.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/isinf.c#1 branch .. //depot/projects/hammer/lib/libc/gen/isnan.c#1 branch .. //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/i386/gen/isinf.c#4 delete .. //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/isinf.c#4 delete .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#20 integrate .. //depot/projects/hammer/lib/libc/locale/nextwctype.3#1 branch .. //depot/projects/hammer/lib/libc/locale/nextwctype.c#1 branch .. //depot/projects/hammer/lib/libc/locale/utf8.c#8 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/isinf.c#3 delete .. //depot/projects/hammer/lib/libc/regex/engine.c#3 integrate .. //depot/projects/hammer/lib/libc/regex/regcomp.c#5 integrate .. //depot/projects/hammer/lib/libc/regex/regerror.c#3 integrate .. //depot/projects/hammer/lib/libc/regex/regex.3#7 integrate .. //depot/projects/hammer/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/hammer/lib/libc/regex/regexec.c#4 integrate .. //depot/projects/hammer/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/isinf.c#4 delete .. //depot/projects/hammer/lib/libc/stdio/fgetwc.c#7 integrate .. //depot/projects/hammer/lib/libc/sys/intro.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/pathconf.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/ptrace.2#6 integrate .. //depot/projects/hammer/lib/libngatm/Makefile#5 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#6 integrate .. //depot/projects/hammer/lib/msun/Makefile#14 integrate .. //depot/projects/hammer/lib/msun/src/e_scalb.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_scalbf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/math.h#19 integrate .. //depot/projects/hammer/lib/msun/src/s_isfinite.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_isnormal.c#1 branch .. //depot/projects/hammer/libexec/atrun/atrun.c#2 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#9 integrate .. //depot/projects/hammer/release/alpha/mkisoimages.sh#3 integrate .. //depot/projects/hammer/release/amd64/mkisoimages.sh#4 integrate .. //depot/projects/hammer/release/i386/mkisoimages.sh#4 integrate .. //depot/projects/hammer/release/ia64/mkisoimages.sh#4 integrate .. //depot/projects/hammer/release/sparc64/mkisoimages.sh#5 integrate .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#4 integrate .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#4 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#4 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#4 integrate .. //depot/projects/hammer/sbin/kldunload/kldunload.8#2 integrate .. //depot/projects/hammer/sbin/kldunload/kldunload.c#4 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#6 integrate .. //depot/projects/hammer/share/man/man4/cm.4#2 integrate .. //depot/projects/hammer/share/man/man4/esp.4#2 integrate .. //depot/projects/hammer/share/man/man4/fatm.4#4 integrate .. //depot/projects/hammer/share/man/man4/hatm.4#6 integrate .. //depot/projects/hammer/share/man/man4/ixgb.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#5 integrate .. //depot/projects/hammer/share/man/man4/matcd.4#5 integrate .. //depot/projects/hammer/share/man/man4/mpt.4#3 integrate .. //depot/projects/hammer/share/man/man4/multicast.4#3 integrate .. //depot/projects/hammer/share/man/man4/natmip.4#5 integrate .. //depot/projects/hammer/share/man/man4/ncv.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_atm.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_atmllc.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_atmpif.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_sppp.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_sscfu.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_sscop.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_uni.4#6 integrate .. //depot/projects/hammer/share/man/man4/nsp.4#3 integrate .. //depot/projects/hammer/share/man/man4/patm.4#5 integrate .. //depot/projects/hammer/share/man/man4/pim.4#2 integrate .. //depot/projects/hammer/share/man/man4/ppbus.4#3 integrate .. //depot/projects/hammer/share/man/man4/rc.4#2 integrate .. //depot/projects/hammer/share/man/man4/re.4#6 integrate .. //depot/projects/hammer/share/man/man4/sab.4#2 integrate .. //depot/projects/hammer/share/man/man4/safe.4#4 integrate .. //depot/projects/hammer/share/man/man4/sbp_targ.4#4 integrate .. //depot/projects/hammer/share/man/man4/stg.4#4 integrate .. //depot/projects/hammer/share/man/man4/tcp.4#10 integrate .. //depot/projects/hammer/share/man/man4/tx.4#2 integrate .. //depot/projects/hammer/share/man/man4/uaudio.4#3 integrate .. //depot/projects/hammer/share/man/man4/ubser.4#2 integrate .. //depot/projects/hammer/share/man/man4/udav.4#2 integrate .. //depot/projects/hammer/share/man/man4/ufm.4#2 integrate .. //depot/projects/hammer/share/man/man4/umct.4#3 integrate .. //depot/projects/hammer/share/man/man4/utopia.4#8 integrate .. //depot/projects/hammer/share/man/man4/xe.4#5 integrate .. //depot/projects/hammer/share/man/man7/hier.7#20 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#8 integrate .. //depot/projects/hammer/share/man/man8/rc.subr.8#5 integrate .. //depot/projects/hammer/share/man/man9/Makefile#36 integrate .. //depot/projects/hammer/share/man/man9/VFS_ROOT.9#5 integrate .. //depot/projects/hammer/share/man/man9/module.9#2 integrate .. //depot/projects/hammer/share/man/man9/physio.9#3 integrate .. //depot/projects/hammer/share/man/man9/sbuf.9#6 integrate .. //depot/projects/hammer/share/man/man9/signal.9#7 integrate .. //depot/projects/hammer/share/man/man9/sx.9#7 integrate .. //depot/projects/hammer/share/man/man9/vflush.9#2 integrate .. //depot/projects/hammer/share/man/man9/vfs_suser.9#1 branch .. //depot/projects/hammer/sys/alpha/alpha/alpha-gdbstub.c#5 delete .. //depot/projects/hammer/sys/alpha/alpha/api_up1000.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/autoconf.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_disasm.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_interface.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_1000a.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_2100_a50.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_2100_a500.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_axppci_33.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_eb164.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_eb64plus.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_kn20aa.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_kn300.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_st550.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_st6600.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#14 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#24 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#29 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#12 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#17 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC.hints#5 integrate .. //depot/projects/hammer/sys/alpha/conf/NOTES#6 integrate .. //depot/projects/hammer/sys/alpha/include/db_machdep.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/hammer/sys/alpha/include/kdb.h#1 branch .. //depot/projects/hammer/sys/alpha/include/pcb.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/ptrace.h#3 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#9 delete .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#94 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#89 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#48 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#45 integrate .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/hammer/sys/amd64/include/kdb.h#1 branch .. //depot/projects/hammer/sys/amd64/include/pcb.h#20 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#27 integrate .. //depot/projects/hammer/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/hammer/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/hammer/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/hammer/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/hammer/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/hammer/sys/arm/include/frame.h#2 integrate .. //depot/projects/hammer/sys/arm/include/kdb.h#1 branch .. //depot/projects/hammer/sys/arm/include/pcb.h#2 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#2 integrate .. //depot/projects/hammer/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/hammer/sys/boot/common/dev_net.c#4 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#13 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#6 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_copy.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/hammer/sys/boot/powerpc/loader/start.c#4 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.h#3 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.c#7 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#18 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#12 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#16 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#15 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#53 integrate .. //depot/projects/hammer/sys/conf/files#71 integrate .. //depot/projects/hammer/sys/conf/files.alpha#16 integrate .. //depot/projects/hammer/sys/conf/files.amd64#50 integrate .. //depot/projects/hammer/sys/conf/files.i386#36 integrate .. //depot/projects/hammer/sys/conf/files.ia64#20 integrate .. //depot/projects/hammer/sys/conf/files.pc98#31 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#9 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#19 integrate .. //depot/projects/hammer/sys/conf/options#46 integrate .. //depot/projects/hammer/sys/conf/options.alpha#7 integrate .. //depot/projects/hammer/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/hammer/sys/contrib/dev/fla/README#2 delete .. //depot/projects/hammer/sys/contrib/dev/fla/fla.c#7 delete .. //depot/projects/hammer/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/hammer/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/hammer/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.c#10 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/addr.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/atmapi.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/cc_conn.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/cc_data.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/cc_dump.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/cc_port.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/cc_sig.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/cc_user.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/ccatm.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/ccpriv.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/unisap.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/unisap.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/genfiles#3 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/misc/straddr.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/misc/unimsg_common.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/geniec.awk#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/genieh.awk#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/ie.def#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/msg.def#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/parseie.awk#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/priv.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/privmsg.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/traffic.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_config.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/unimsglib.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uniprint.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/unistruct.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscfu.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscfudef.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscfupriv.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscop.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscopdef.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscoppriv.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/sig_call.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/sig_coord.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/sig_party.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/sig_print.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/sig_reset.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/sig_uni.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/sig_verify.c#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/uni.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/unidef.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/unimkmsg.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/unipriv.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/sig/unisig.h#2 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/unimsg.h#2 integrate .. //depot/projects/hammer/sys/ddb/db_access.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_break.c#5 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#9 integrate .. //depot/projects/hammer/sys/ddb/db_elf.c#6 delete .. //depot/projects/hammer/sys/ddb/db_kld.c#3 delete .. //depot/projects/hammer/sys/ddb/db_main.c#1 branch .. //depot/projects/hammer/sys/ddb/db_output.c#5 integrate .. //depot/projects/hammer/sys/ddb/db_print.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#13 integrate .. //depot/projects/hammer/sys/ddb/db_run.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_sysctl.c#3 delete .. //depot/projects/hammer/sys/ddb/db_thread.c#1 branch .. //depot/projects/hammer/sys/ddb/db_trap.c#3 delete .. //depot/projects/hammer/sys/ddb/db_variables.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_variables.h#2 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#6 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdDebug.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#42 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#14 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#31 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7770.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#30 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#19 integrate .. //depot/projects/hammer/sys/dev/ct/ct.c#5 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#13 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#10 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#7 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#15 integrate .. //depot/projects/hammer/sys/dev/digi/digi.h#5 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#19 integrate .. //depot/projects/hammer/sys/dev/fb/creator.c#5 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#2 integrate .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/hammer/sys/dev/led/led.c#10 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_debug.c#4 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500.c#5 integrate .. //depot/projects/hammer/sys/dev/nsp/nsp.c#6 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#13 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#8 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#8 integrate .. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#9 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppi.c#8 integrate .. //depot/projects/hammer/sys/dev/ppbus/pps.c#8 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#7 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#12 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#13 integrate .. //depot/projects/hammer/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#17 integrate .. //depot/projects/hammer/sys/dev/si/si.c#12 integrate .. //depot/projects/hammer/sys/dev/si/si.h#3 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#38 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30.c#6 integrate .. //depot/projects/hammer/sys/dev/sx/sx.c#8 integrate .. //depot/projects/hammer/sys/dev/sx/sx.h#3 integrate .. //depot/projects/hammer/sys/dev/syscons/scvidctl.c#4 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#20 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dbg.c#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#42 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumhdr.h#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinuminterrupt.c#7 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#12 integrate .. //depot/projects/hammer/sys/dev/vinum/vinummemory.c#6 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#12 integrate .. //depot/projects/hammer/sys/doc/Doxyfile#1 branch .. //depot/projects/hammer/sys/doc/Makefile#1 branch .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#20 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#8 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#5 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.h#6 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#10 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#8 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#8 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/hammer/sys/gdb/gdb.h#1 branch .. //depot/projects/hammer/sys/gdb/gdb_int.h#1 branch .. //depot/projects/hammer/sys/gdb/gdb_main.c#1 branch .. //depot/projects/hammer/sys/gdb/gdb_packet.c#1 branch .. //depot/projects/hammer/sys/geom/geom_event.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_int.h#10 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#27 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#3 integrate .. //depot/projects/hammer/sys/geom/label/g_label.h#3 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_subr.c#3 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#17 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#46 integrate .. //depot/projects/hammer/sys/i386/conf/OLDCARD#5 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/gdb_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/i386/i386-gdbstub.c#6 delete .. //depot/projects/hammer/sys/i386/i386/locore.s#12 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#37 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#44 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#26 integrate .. //depot/projects/hammer/sys/i386/include/db_machdep.h#2 integrate .. //depot/projects/hammer/sys/i386/include/frame.h#4 integrate .. //depot/projects/hammer/sys/i386/include/gdb_machdep.h#1 branch .. //depot/projects/hammer/sys/i386/include/kdb.h#1 branch .. //depot/projects/hammer/sys/i386/include/pcb.h#10 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#18 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_hdr.h#7 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_kbd.c#4 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#15 integrate .. //depot/projects/hammer/sys/ia64/conf/SKI#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/autoconf.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_interface.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/gdb_machdep.c#1 branch .. //depot/projects/hammer/sys/ia64/ia64/ia64-gdbstub.c#2 delete .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#37 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#29 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#25 integrate .. //depot/projects/hammer/sys/ia64/ia64/unwind.c#8 integrate .. //depot/projects/hammer/sys/ia64/include/db_machdep.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/gdb_machdep.h#1 branch .. //depot/projects/hammer/sys/ia64/include/kdb.h#1 branch .. //depot/projects/hammer/sys/ia64/include/md_var.h#8 integrate .. //depot/projects/hammer/sys/ia64/include/pcb.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/unwind.h#6 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#15 integrate .. //depot/projects/hammer/sys/kern/device_if.m#2 integrate .. //depot/projects/hammer/sys/kern/init_main.c#24 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#44 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#57 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#19 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#46 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#21 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#38 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#1 branch .. //depot/projects/hammer/sys/kern/subr_prf.c#17 integrate .. //depot/projects/hammer/sys/kern/subr_sbuf.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#30 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#15 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#16 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#31 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#32 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#14 integrate .. //depot/projects/hammer/sys/kern/tty.c#21 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#15 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#32 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#31 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#7 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#31 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#45 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#33 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#18 integrate .. //depot/projects/hammer/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/de/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/fdc/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/firewire/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/firewire/fwip/Makefile#1 branch .. //depot/projects/hammer/sys/modules/nfs4client/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/nfsclient/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/uart/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/usb/Makefile#5 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#31 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#12 integrate .. //depot/projects/hammer/sys/netatalk/at_control.c#5 integrate .. //depot/projects/hammer/sys/netatalk/at_rmx.c#3 integrate .. //depot/projects/hammer/sys/netatalk/ddp_input.c#7 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#11 integrate .. //depot/projects/hammer/sys/netatalk/ddp_var.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_frame_relay.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#17 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#33 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#34 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#11 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#18 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#25 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#19 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#30 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#31 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#15 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#19 integrate .. //depot/projects/hammer/sys/pc98/pc98/fdc_cbus.c#1 branch .. //depot/projects/hammer/sys/pc98/pc98/fdcvar.h#1 branch .. //depot/projects/hammer/sys/pc98/pc98/isa_dma.c#3 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98.h#3 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#27 integrate .. //depot/projects/hammer/sys/pci/if_devar.h#6 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#38 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#24 integrate .. //depot/projects/hammer/sys/pci/if_vrreg.h#6 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#41 integrate .. //depot/projects/hammer/sys/pci/if_xlreg.h#10 integrate .. //depot/projects/hammer/sys/pci/ncr.c#12 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/hammer/sys/powerpc/include/cpufunc.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/db_machdep.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/kdb.h#1 branch .. //depot/projects/hammer/sys/powerpc/include/pcb.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/pcpu.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_interface.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/genassym.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/locore.S#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#25 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#24 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/trap_subr.S#6 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#25 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#7 integrate .. //depot/projects/hammer/sys/sparc64/creator/creator_upa.c#6 integrate .. //depot/projects/hammer/sys/sparc64/include/db_machdep.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/frame.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/gdb_machdep.h#1 branch .. //depot/projects/hammer/sys/sparc64/include/kdb.h#1 branch .. //depot/projects/hammer/sys/sparc64/include/pcb.h#6 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#21 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/gdb_machdep.c#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#28 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#14 integrate .. //depot/projects/hammer/sys/sys/conf.h#15 integrate .. //depot/projects/hammer/sys/sys/kdb.h#1 branch .. //depot/projects/hammer/sys/sys/kse.h#16 integrate .. //depot/projects/hammer/sys/sys/linker.h#13 integrate .. //depot/projects/hammer/sys/sys/module.h#2 integrate .. //depot/projects/hammer/sys/sys/mount.h#21 integrate .. //depot/projects/hammer/sys/sys/param.h#39 integrate .. //depot/projects/hammer/sys/sys/proc.h#57 integrate .. //depot/projects/hammer/sys/sys/ptrace.h#5 integrate .. //depot/projects/hammer/sys/sys/sbuf.h#4 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#12 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#21 integrate .. //depot/projects/hammer/sys/sys/sx.h#3 integrate .. //depot/projects/hammer/sys/sys/syscall.h#31 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#31 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#31 integrate .. //depot/projects/hammer/sys/sys/systm.h#20 integrate .. //depot/projects/hammer/sys/sys/tty.h#13 integrate .. //depot/projects/hammer/sys/sys/uio.h#9 integrate .. //depot/projects/hammer/sys/sys/user.h#14 integrate .. //depot/projects/hammer/sys/sys/vnode.h#28 integrate .. //depot/projects/hammer/sys/tools/makeobjops.awk#5 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_subr.c#6 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#24 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#12 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vfsops.c#5 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#30 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#28 integrate .. //depot/projects/hammer/tools/regression/atm/RunTest.sh#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#16 integrate .. //depot/projects/hammer/usr.bin/csplit/csplit.1#4 integrate .. //depot/projects/hammer/usr.bin/gcore/elfcore.c#5 integrate .. //depot/projects/hammer/usr.bin/gprof/gprof.c#6 integrate .. //depot/projects/hammer/usr.bin/hexdump/conv.c#3 integrate .. //depot/projects/hammer/usr.bin/hexdump/display.c#3 integrate .. //depot/projects/hammer/usr.bin/hexdump/hexdump.1#4 integrate .. //depot/projects/hammer/usr.bin/hexdump/hexdump.h#3 integrate .. //depot/projects/hammer/usr.bin/hexdump/od.1#4 integrate .. //depot/projects/hammer/usr.bin/m4/main.c#3 integrate .. //depot/projects/hammer/usr.bin/nfsstat/nfsstat.c#2 integrate .. //depot/projects/hammer/usr.bin/nl/nl.1#3 integrate .. //depot/projects/hammer/usr.bin/nl/nl.c#4 integrate .. //depot/projects/hammer/usr.bin/sed/process.c#8 integrate .. //depot/projects/hammer/usr.bin/split/split.1#2 integrate .. //depot/projects/hammer/usr.bin/split/split.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#15 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#8 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#8 integrate .. //depot/projects/hammer/usr.bin/tr/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/tr/cmap.c#1 branch .. //depot/projects/hammer/usr.bin/tr/cmap.h#1 branch .. //depot/projects/hammer/usr.bin/tr/cset.c#1 branch .. //depot/projects/hammer/usr.bin/tr/cset.h#1 branch .. //depot/projects/hammer/usr.bin/tr/extern.h#3 integrate .. //depot/projects/hammer/usr.bin/tr/str.c#3 integrate .. //depot/projects/hammer/usr.bin/tr/tr.1#7 integrate .. //depot/projects/hammer/usr.bin/tr/tr.c#4 integrate .. //depot/projects/hammer/usr.bin/truss/syscall.h#4 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#12 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.c#9 integrate .. //depot/projects/hammer/usr.sbin/mrouted/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/sliplogin/sliplogin.c#3 integrate .. //depot/projects/hammer/usr.sbin/smbmsg/smbmsg.8#2 integrate Differences ... ==== //depot/projects/hammer/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.299 2004/04/13 13:42:01 des Exp $ +# $FreeBSD: src/Makefile,v 1.300 2004/07/09 13:55:50 phk Exp $ # # The user-driven targets are: # @@ -235,7 +235,7 @@ .for arch in i386 sparc64 alpha ia64 amd64 .for mach in ${arch} ${${arch}_mach} @echo ">> ${mach} started on `LC_ALL=C date`" - -cd ${.CURDIR} && ${MAKE} buildworld \ + -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ TARGET_ARCH=${arch} TARGET=${mach} \ __MAKE_CONF=/dev/null \ > _.${mach}.buildworld 2>&1 @@ -244,7 +244,7 @@ -cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \ > ${.CURDIR}/_.${mach}.makeLINT 2>&1 .endif - cd ${.CURDIR} && ${MAKE} buildkernels TARGET_ARCH=${arch} TARGET=${mach} + cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernels TARGET_ARCH=${arch} TARGET=${mach} @echo ">> ${mach} completed on `LC_ALL=C date`" .endfor .endfor @@ -260,7 +260,7 @@ buildkernels: .for kernel in ${KERNCONFS} - -cd ${.CURDIR} && ${MAKE} buildkernel \ + -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ KERNCONF=${kernel} \ __MAKE_CONF=/dev/null \ > _.${TARGET}.${kernel} 2>&1 ==== //depot/projects/hammer/Makefile.inc1#54 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.430 2004/06/17 08:06:41 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.431 2004/07/08 09:08:09 harti Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -367,10 +367,6 @@ SRC_TIMET!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | \ awk '{print $$2}' NEWSPARC_TIMETYPE?=${CUR_TIMET} -THISHOST!= hostname -s -.if empty(THISHOST) -THISHOST="name not set yet" -.endif sparc64_installcheck: .if ${CUR_TIMET} != ${SRC_TIMET} @@ -381,7 +377,7 @@ @echo "* Note: This installation changes the type used for time_t." .endif @echo "* " - @echo "* This host (${THISHOST}) has time_t defined as ${CUR_TIMET}," + @echo "* This host has time_t defined as ${CUR_TIMET}," @echo "* and this installation would change that to type ${SRC_TIMET}." .if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET} @echo "* " ==== //depot/projects/hammer/UPDATING#45 (text+ko) ==== @@ -17,10 +17,44 @@ developers choose to disable these features on build machines to maximize performance. +20040710: + __FreeBSD_version bumped to 502122. + +20040710: + The console initialization on Alpha has been reworked and is now + identical to other platforms. This means that the hardcoding of + the serial console and the debug port has been removed. As such, + hints are now required for the sio(4) driver to become a console + or debug port. The NO_SIO option has been decommissioned because + of this. + +20040710: + A revamp of the debugging code in the kernel with some visible + changes beyond just the debugging experience: + o The DDB option is now specific to the DDB debugger backend + and should not be used any more for conditional compilation + of debugging code for when debugging is enabled. Use the KDB + option for this. + o The WITNESS_DDB, DDB_TRACE and DDB_UNATTENDED options have + been renamed to WITNESS_KDB, KDB_TRACE and KDB_UNATTENDED + respectively. This is in line with the first bullet. + o The remote GDB support has been untangled from DDB and needs + to be enabled seperately now. Use the GDB option for this. + o The GDB_REMOTE_CHAT option has been removed. Support for this + homegrown feature is discontinued. The GDB remote protocol + supports console output and it makes sense to use that. + o The DDB_NOKLDSYM option has been removed. The DDB debugger + now supports both direct symbol table lookups as well as KLD + symbol lookups through the linker. + +20040708: + Bluetooth code has been marked as non-i386 specific. + __FreeBSD_version has been bumped to 502121 to mark this change. + 20040702: The native preemption has been added to the kernel scheduler. There is some report that ULE scheduler was broken in some - machines and we encourage users using ULE schedluer either + machines and we encourage users using ULE scheduler either stick with an known good kernel, or temporary switch to 4BSD scheduler as a workaround. @@ -1680,4 +1714,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.322 2004/07/05 18:11:59 imp Exp $ +$FreeBSD: src/UPDATING,v 1.325 2004/07/11 13:26:44 simon Exp $ ==== //depot/projects/hammer/bin/csh/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* config.h. Generated automatically by configure. */ +/* config.h. Generated by configure. */ /* * config.h -- configure various defines for tcsh * @@ -7,7 +7,7 @@ * Edit this to match your system type. */ -/* $FreeBSD: src/bin/csh/config.h,v 1.7 2001/09/05 22:56:58 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.8 2004/07/11 02:23:38 mp Exp $ */ #ifndef _h_config #define _h_config @@ -29,14 +29,14 @@ /* #undef POSIXSIGS */ /* - * VFORK This machine has a vfork(). + * VFORK This machine has a vfork(). * It used to be that for job control to work, this define * was mandatory. This is not the case any more. - * If you think you still need it, but you don't have vfork, - * define this anyway and then do #define vfork fork. + * If you think you still need it, but you don't have vfork, + * define this anyway and then do #define vfork fork. * I do this anyway on a Sun because of yellow pages brain damage, * [should not be needed under 4.1] - * and on the iris4d cause SGI's fork is sufficiently "virtual" + * and on the iris4d cause SGI's fork is sufficiently "virtual" * that vfork isn't necessary. (Besides, SGI's vfork is weird). * Note that some machines eg. rs6000 have a vfork, but not * with the berkeley semantics, so we cannot use it there either. @@ -101,7 +101,7 @@ * SIGVOID Define this if your signal handlers return void. On older * systems, signal returns int, but on newer ones, it returns void. */ -#define SIGVOID +#define SIGVOID /* * HAVEDUP2 Define this if your system supports dup2(). @@ -132,11 +132,19 @@ #define BSD_STYLE_COLORLS #endif +#if defined(__NetBSD__) +#include +#if __NetBSD_Version__ >= 106030000 /* NetBSD 1.6C */ +#define HAVEUTMPX +#endif +#endif + #if defined(__bsdi__) /* * _PATH_TCSHELL if you've change the installation location (vix) */ -# if _BSDI_VERSION >= 199701 +#include +# ifdef _BSDI_VERSION >= 199701 # define _PATH_TCSHELL "/bin/tcsh" /* # undef SYSMALLOC */ # define SYSMALLOC @@ -144,8 +152,8 @@ # define _PATH_TCSHELL "/usr/contrib/bin/tcsh" # endif -# undef NLS -# undef NLS_CATALOGS +/* # undef NLS */ +/* # undef NLS_CATALOGS */ #elif defined(__APPLE__) # define SYSMALLOC @@ -154,8 +162,5 @@ # define NLS_CATALOGS #endif -#define KANJI -#define DSPMBYTE - #endif /* _h_config */ /* config.h.in. Generated automatically from configure.in by autoheader. */ ==== //depot/projects/hammer/bin/expr/expr.1#5 (text+ko) ==== @@ -28,9 +28,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/expr/expr.1,v 1.24 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.25 2004/07/12 10:46:55 tjr Exp $ .\" -.Dd July 3, 2004 +.Dd July 12, 2004 .Dt EXPR 1 .Os .Sh NAME @@ -261,7 +261,3 @@ The .Fl e flag is an extension. -.Sh BUGS -The -.Nm -utility does not recognize multibyte characters. ==== //depot/projects/hammer/contrib/ngatm/libngatm/sscfucust.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt * - * $Begemot: libunimsg/libunimsg/sscfucust.h,v 1.3 2003/09/19 13:10:35 hbb Exp $ + * $Begemot: libunimsg/libngatm/sscfucust.h,v 1.4 2004/07/08 08:21:40 brandt Exp $ * * Customisation of the SSCFU code for the user space library. */ ==== //depot/projects/hammer/contrib/ngatm/libngatm/sscopcust.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt * - * $Begemot: libunimsg/libunimsg/sscopcust.h,v 1.3 2003/09/19 13:10:35 hbb Exp $ + * $Begemot: libunimsg/libngatm/sscopcust.h,v 1.4 2004/07/08 08:21:40 brandt Exp $ * * Customisation of the SSCOP code for the user space library. */ ==== //depot/projects/hammer/contrib/ngatm/libngatm/unimsg.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 13 23:58:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9794916A4D0; Tue, 13 Jul 2004 23:58:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CA4B16A4CE for ; Tue, 13 Jul 2004 23:58:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62B8243D31 for ; Tue, 13 Jul 2004 23:58:14 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6DNwEmq082187 for ; Tue, 13 Jul 2004 23:58:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6DNwEXm082184 for perforce@freebsd.org; Tue, 13 Jul 2004 23:58:14 GMT (envelope-from peter@freebsd.org) Date: Tue, 13 Jul 2004 23:58:14 GMT Message-Id: <200407132358.i6DNwEXm082184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2004 23:58:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=57305 Change 57305 by peter@peter_daintree on 2004/07/13 23:58:13 make this compile. NOPROTO is used for untranslated syscalls. Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#19 edit .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#21 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#19 (text+ko) ==== @@ -205,10 +205,6 @@ struct freebsd32_sigreturn_args { char sigcntxp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd32_ucontext *)]; }; -struct kldunloadf_args { - char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); @@ -239,7 +235,6 @@ int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *); int freebsd32_sigreturn(struct thread *, struct freebsd32_sigreturn_args *); -int kldunloadf(struct thread *, struct kldunloadf_args *); #ifdef COMPAT_43 ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#21 (text+ko) ==== @@ -609,4 +609,4 @@ 441 UNIMPL ksem_timedwait 442 MNOPROTO { int thr_suspend(const struct timespec *timeout); } 443 MNOPROTO { int thr_wake(long id); } -444 MSTD { int kldunloadf(int fileid, int flags); } +444 MNOPROTO { int kldunloadf(int fileid, int flags); } From owner-p4-projects@FreeBSD.ORG Wed Jul 14 00:02:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4933716A4D0; Wed, 14 Jul 2004 00:02:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E4BF16A4CE for ; Wed, 14 Jul 2004 00:02:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00C2343D1F for ; Wed, 14 Jul 2004 00:02:19 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6E02JQL082311 for ; Wed, 14 Jul 2004 00:02:19 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6E02Joq082308 for perforce@freebsd.org; Wed, 14 Jul 2004 00:02:19 GMT (envelope-from peter@freebsd.org) Date: Wed, 14 Jul 2004 00:02:19 GMT Message-Id: <200407140002.i6E02Joq082308@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 00:02:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=57306 Change 57306 by peter@peter_daintree on 2004/07/14 00:01:25 Corresponding elimination of pv_ptem for amd64. I have not test booted this yet. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#90 edit .. //depot/projects/hammer/sys/amd64/include/pmap.h#41 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#90 (text+ko) ==== @@ -207,17 +207,17 @@ static pv_entry_t get_pv_entry(void); static void pmap_clear_ptes(vm_page_t m, int bit); -static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); +static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, + vm_offset_t sva, pd_entry_t ptepde); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, - vm_offset_t va); -static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, - vm_page_t mpte, vm_page_t m); + vm_offset_t va, pd_entry_t ptepde); +static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex); -static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); +static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); @@ -334,6 +334,23 @@ } +static __inline pt_entry_t * +pmap_pte_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *ptepde) +{ + pd_entry_t *pde; + pt_entry_t *pte; + + pde = pmap_pde(pmap, va); + if (pde == NULL || (*pde & PG_V) == 0) + return NULL; + *ptepde = *pde; + if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ + return ((pt_entry_t *)pde); + pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); + return (&pte[pmap_pte_index(va)]); +} + + PMAP_INLINE pt_entry_t * vtopte(vm_offset_t va) { @@ -342,6 +359,14 @@ return (PTmap + (amd64_btop(va) & mask)); } +static __inline pd_entry_t * +vtopde(vm_offset_t va) +{ + u_int64_t mask = ((1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); + + return (PTmap + (amd64_btop(va) & mask)); +} + static u_int64_t allocpages(int n) { @@ -1034,12 +1059,16 @@ * conditionally free the page, and manage the hold/wire counts. */ static int -pmap_unuse_pt(pmap_t pmap, vm_offset_t va, vm_page_t mpte) +pmap_unuse_pt(pmap_t pmap, vm_offset_t va, pd_entry_t ptepde) { + vm_page_t mpte; if (va >= VM_MAXUSER_ADDRESS) return 0; - +/* XXX this should be an error, all cases should be caught now */ + if (ptepde == 0) + ptepde = *pmap_pde(pmap, va); + mpte = PHYS_TO_VM_PAGE(ptepde & PG_FRAME); return pmap_unwire_pte_hold(pmap, va, mpte); } @@ -1437,7 +1466,7 @@ static int -pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) +pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va, pd_entry_t ptepde) { pv_entry_t pv; int rtval; @@ -1458,7 +1487,7 @@ rtval = 0; if (pv) { - rtval = pmap_unuse_pt(pmap, va, pv->pv_ptem); + rtval = pmap_unuse_pt(pmap, va, ptepde); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; if (TAILQ_FIRST(&m->md.pv_list) == NULL) @@ -1476,14 +1505,13 @@ * (pmap, va). */ static void -pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m) +pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) { pv_entry_t pv; pv = get_pv_entry(); pv->pv_va = va; pv->pv_pmap = pmap; - pv->pv_ptem = mpte; vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); @@ -1496,10 +1524,10 @@ * pmap_remove_pte: do the things to unmap a page in a process */ static int -pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va) +pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va, pd_entry_t ptepde) { pt_entry_t oldpte; - vm_page_t m, mpte; + vm_page_t m; PMAP_LOCK_ASSERT(pmap, MA_OWNED); oldpte = pte_load_clear(ptq); @@ -1527,10 +1555,9 @@ } if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); - return pmap_remove_entry(pmap, m, va); + return pmap_remove_entry(pmap, m, va, ptepde); } else { - mpte = PHYS_TO_VM_PAGE(*pmap_pde(pmap, va) & PG_FRAME); - return pmap_unuse_pt(pmap, va, mpte); + return pmap_unuse_pt(pmap, va, ptepde); } } @@ -1540,13 +1567,14 @@ static void pmap_remove_page(pmap_t pmap, vm_offset_t va) { + pd_entry_t ptepde; pt_entry_t *pte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); - pte = pmap_pte(pmap, va); + pte = pmap_pte_pde(pmap, va, &ptepde); if (pte == NULL || (*pte & PG_V) == 0) return; - pmap_remove_pte(pmap, pte, va); + pmap_remove_pte(pmap, pte, va, ptepde); pmap_invalidate_page(pmap, va); } @@ -1649,7 +1677,7 @@ if (pte == NULL || *pte == 0) continue; anyvalid = 1; - if (pmap_remove_pte(pmap, pte, sva)) + if (pmap_remove_pte(pmap, pte, sva, ptpaddr)) break; } } @@ -1677,6 +1705,7 @@ { register pv_entry_t pv; pt_entry_t *pte, tpte; + pd_entry_t ptepde; #if defined(PMAP_DIAGNOSTIC) /* @@ -1691,7 +1720,7 @@ while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pv->pv_pmap->pm_stats.resident_count--; - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pte = pmap_pte_pde(pv->pv_pmap, pv->pv_va, &ptepde); tpte = pte_load_clear(pte); if (tpte & PG_W) pv->pv_pmap->pm_stats.wired_count--; @@ -1716,7 +1745,7 @@ TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pv->pv_pmap, pv->pv_va, ptepde); PMAP_UNLOCK(pv->pv_pmap); free_pv_entry(pv); } @@ -1849,6 +1878,7 @@ vm_paddr_t pa; register pt_entry_t *pte; vm_paddr_t opa; + pd_entry_t ptepde; pt_entry_t origpte, newpte; vm_page_t mpte; @@ -1882,7 +1912,7 @@ } #endif - pte = pmap_pte(pmap, va); + pte = pmap_pte_pde(pmap, va, &ptepde); /* * Page Directory table entry not valid, we need a new PT page @@ -1948,7 +1978,7 @@ int err; vm_page_lock_queues(); PMAP_LOCK(pmap); - err = pmap_remove_pte(pmap, pte, va); + err = pmap_remove_pte(pmap, pte, va, ptepde); PMAP_UNLOCK(pmap); vm_page_unlock_queues(); if (err) @@ -1962,7 +1992,7 @@ */ if (pmap_initialized && (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { - pmap_insert_entry(pmap, va, mpte, m); + pmap_insert_entry(pmap, va, m); pa |= PG_MANAGED; } @@ -2080,7 +2110,7 @@ * called at interrupt time. */ if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) - pmap_insert_entry(pmap, va, mpte, m); + pmap_insert_entry(pmap, va, m); /* * Increment counters @@ -2331,8 +2361,7 @@ m = PHYS_TO_VM_PAGE(ptetemp & PG_FRAME); *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; - pmap_insert_entry(dst_pmap, addr, - dstmpte, m); + pmap_insert_entry(dst_pmap, addr, m); } else { vm_page_lock_queues(); pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); @@ -2516,7 +2545,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, *vtopde(pv->pv_va)); free_pv_entry(pv); } pmap_invalidate_all(pmap); ==== //depot/projects/hammer/sys/amd64/include/pmap.h#41 (text+ko) ==== @@ -256,7 +256,6 @@ vm_offset_t pv_va; /* virtual address for mapping */ TAILQ_ENTRY(pv_entry) pv_list; TAILQ_ENTRY(pv_entry) pv_plist; - vm_page_t pv_ptem; /* VM page for pte */ } *pv_entry_t; #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Wed Jul 14 01:01:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31DA916A4D0; Wed, 14 Jul 2004 01:01:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06FBC16A4CE for ; Wed, 14 Jul 2004 01:01:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F209343D49 for ; Wed, 14 Jul 2004 01:01:31 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6E11Vrj083933 for ; Wed, 14 Jul 2004 01:01:31 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6E11V86083930 for perforce@freebsd.org; Wed, 14 Jul 2004 01:01:31 GMT (envelope-from peter@freebsd.org) Date: Wed, 14 Jul 2004 01:01:31 GMT Message-Id: <200407140101.i6E11V86083930@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 01:01:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=57308 Change 57308 by peter@peter_melody on 2004/07/14 01:01:11 Fix vtopde(). Use PAGE_SHIFT/PDRSHIFT for clarity so that they can be compared to the pte_index/pde_index routines above. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#91 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#91 (text+ko) ==== @@ -356,7 +356,7 @@ { u_int64_t mask = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); - return (PTmap + (amd64_btop(va) & mask)); + return (PTmap + ((va >> PAGE_SHIFT) & mask)); } static __inline pd_entry_t * @@ -364,7 +364,7 @@ { u_int64_t mask = ((1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); - return (PTmap + (amd64_btop(va) & mask)); + return (PDmap + ((va >> PDRSHIFT) & mask)); } static u_int64_t From owner-p4-projects@FreeBSD.ORG Wed Jul 14 01:02:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CB4D16A4D0; Wed, 14 Jul 2004 01:02:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCB9E16A4CE for ; Wed, 14 Jul 2004 01:02:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D256243D1D for ; Wed, 14 Jul 2004 01:02:33 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6E12XXc083951 for ; Wed, 14 Jul 2004 01:02:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6E12XX8083948 for perforce@freebsd.org; Wed, 14 Jul 2004 01:02:33 GMT (envelope-from wsalamon@computer.org) Date: Wed, 14 Jul 2004 01:02:33 GMT Message-Id: <200407140102.i6E12XX8083948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 57309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 01:02:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=57309 Change 57309 by wsalamon@wsalamon_epi on 2004/07/14 01:01:35 Add audit-related system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#2 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#2 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#2 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.170 2004/04/05 10:16:38 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp */ @@ -472,4 +472,13 @@ { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend }, /* 442 = thr_suspend */ { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake }, /* 443 = thr_wake */ + { SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit }, /* 444 = audit */ + { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon }, /* 445 = auditon */ + { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid }, /* 446 = getauid */ + { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)setauid }, /* 447 = setauid */ + { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)getaudit }, /* 448 = getaudit */ + { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)setaudit }, /* 449 = setaudit */ + { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)getaudit_addr }, /* 450 = getaudit_addr */ + { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)setaudit_addr }, /* 451 = setaudit_addr */ + { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl }, /* 452 = auditctl */ }; ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.156 2004/04/05 10:16:38 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp */ @@ -451,4 +451,13 @@ "ksem_timedwait", /* 441 = ksem_timedwait */ "thr_suspend", /* 442 = thr_suspend */ "thr_wake", /* 443 = thr_wake */ + "audit", /* 444 = audit */ + "auditon", /* 445 = auditon */ + "getauid", /* 446 = getauid */ + "setauid", /* 447 = setauid */ + "getaudit", /* 448 = getaudit */ + "setaudit", /* 449 = setaudit */ + "getaudit_addr", /* 450 = getaudit_addr */ + "setaudit_addr", /* 451 = setaudit_addr */ + "auditctl", /* 452 = auditctl */ }; ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#2 (text+ko) ==== @@ -631,5 +631,16 @@ 441 MNOSTD { int ksem_timedwait(semid_t id, struct timespec *abstime); } 442 MSTD { int thr_suspend(const struct timespec *timeout); } 443 MSTD { int thr_wake(thr_id_t id); } +444 MSTD { int audit(const void *record, u_int length); } +445 MSTD { int auditon(int cmd, void *data, u_int length); } +446 MSTD { int getauid(uid_t *auid); } +447 MSTD { int setauid(uid_t *auid); } +448 MSTD { int getaudit(struct auditinfo *auditinfo); } +449 MSTD { int setaudit(struct auditinfo *auditinfo); } +450 MSTD { int getaudit_addr(struct auditinfo_addr \ + *auditinfo_addr, u_int length); } +451 MSTD { int setaudit_addr(struct auditinfo_addr \ + *auditinfo_addr, u_int length); } +452 MSTD { int auditctl(char *path); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.154 2004/04/05 10:16:38 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp */ @@ -356,4 +356,13 @@ #define SYS_ksem_timedwait 441 #define SYS_thr_suspend 442 #define SYS_thr_wake 443 -#define SYS_MAXSYSCALL 444 +#define SYS_audit 444 +#define SYS_auditon 445 +#define SYS_getauid 446 +#define SYS_setauid 447 +#define SYS_getaudit 448 +#define SYS_setaudit 449 +#define SYS_getaudit_addr 450 +#define SYS_setaudit_addr 451 +#define SYS_auditctl 452 +#define SYS_MAXSYSCALL 453 ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#2 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.109 2004/04/05 10:16:38 dfr Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp MIASM = \ syscall.o \ @@ -297,4 +297,13 @@ kse_switchin.o \ ksem_timedwait.o \ thr_suspend.o \ - thr_wake.o + thr_wake.o \ + audit.o \ + auditon.o \ + getauid.o \ + setauid.o \ + getaudit.o \ + setaudit.o \ + getaudit_addr.o \ + setaudit_addr.o \ + auditctl.o ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.153 2004/04/05 10:16:39 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp */ @@ -1312,10 +1312,6 @@ char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)]; }; -struct auditsvc_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char limit_l_[PADL_(int)]; int limit; char limit_r_[PADR_(int)]; -}; struct getauid_args { char auid_l_[PADL_(uid_t *)]; uid_t * auid; char auid_r_[PADR_(uid_t *)]; }; @@ -1635,7 +1631,6 @@ int thr_wake(struct thread *, struct thr_wake_args *); int audit(struct thread *, struct audit_args *); int auditon(struct thread *, struct auditon_args *); -int auditsvc(struct thread *, struct auditsvc_args *); int getauid(struct thread *, struct getauid_args *); int setauid(struct thread *, struct setauid_args *); int getaudit(struct thread *, struct getaudit_args *); From owner-p4-projects@FreeBSD.ORG Wed Jul 14 03:13:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3F1B16A4D0; Wed, 14 Jul 2004 03:13:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE8BA16A4CE for ; Wed, 14 Jul 2004 03:13:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A51DB43D1F for ; Wed, 14 Jul 2004 03:13:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6E3DBhU087313 for ; Wed, 14 Jul 2004 03:13:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6E3DBXh087310 for perforce@freebsd.org; Wed, 14 Jul 2004 03:13:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 14 Jul 2004 03:13:11 GMT Message-Id: <200407140313.i6E3DBXh087310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 03:13:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=57312 Change 57312 by rwatson@rwatson_tislabs on 2004/07/14 03:12:30 Search and replace: rename "mb_single" and "mm_single" to "mb_effective" and "mm_effective" respectively in the Biba and MLS policies. "single label" in these policies was causing confusion with respect to "singlelabel file systems", and "effective" generally describes the label better than "single". Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#244 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#16 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#198 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#244 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson - * Copyright (c) 2001-2003 Networks Associates Technology, Inc. + * Copyright (c) 2001-2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -227,9 +227,9 @@ { struct mac_biba_element *element; - KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, - ("mac_biba_single_in_range: mac_biba not single")); - element = &mac_biba->mb_single; + KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) != 0, + ("mac_biba_effective_in_range: mac_biba not effective")); + element = &mac_biba->mb_effective; return (element->mbe_type == MAC_BIBA_TYPE_EQUAL || element->mbe_type == MAC_BIBA_TYPE_HIGH); @@ -246,31 +246,32 @@ } static int -mac_biba_single_in_range(struct mac_biba *single, struct mac_biba *range) +mac_biba_effective_in_range(struct mac_biba *effective, + struct mac_biba *range) { - KASSERT((single->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, - ("mac_biba_single_in_range: a not single")); + KASSERT((effective->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) != 0, + ("mac_biba_effective_in_range: a not effective")); KASSERT((range->mb_flags & MAC_BIBA_FLAG_RANGE) != 0, - ("mac_biba_single_in_range: b not range")); + ("mac_biba_effective_in_range: b not range")); return (mac_biba_dominate_element(&range->mb_rangehigh, - &single->mb_single) && - mac_biba_dominate_element(&single->mb_single, + &effective->mb_effective) && + mac_biba_dominate_element(&effective->mb_effective, &range->mb_rangelow)); return (1); } static int -mac_biba_dominate_single(struct mac_biba *a, struct mac_biba *b) +mac_biba_dominate_effective(struct mac_biba *a, struct mac_biba *b) { - KASSERT((a->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, - ("mac_biba_dominate_single: a not single")); - KASSERT((b->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, - ("mac_biba_dominate_single: b not single")); + KASSERT((a->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) != 0, + ("mac_biba_dominate_effective: a not effective")); + KASSERT((b->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) != 0, + ("mac_biba_dominate_effective: b not effective")); - return (mac_biba_dominate_element(&a->mb_single, &b->mb_single)); + return (mac_biba_dominate_element(&a->mb_effective, &b->mb_effective)); } static int @@ -285,23 +286,23 @@ } static int -mac_biba_equal_single(struct mac_biba *a, struct mac_biba *b) +mac_biba_equal_effective(struct mac_biba *a, struct mac_biba *b) { - KASSERT((a->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, - ("mac_biba_equal_single: a not single")); - KASSERT((b->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, - ("mac_biba_equal_single: b not single")); + KASSERT((a->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) != 0, + ("mac_biba_equal_effective: a not effective")); + KASSERT((b->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) != 0, + ("mac_biba_equal_effective: b not effective")); - return (mac_biba_equal_element(&a->mb_single, &b->mb_single)); + return (mac_biba_equal_element(&a->mb_effective, &b->mb_effective)); } static int mac_biba_contains_equal(struct mac_biba *mac_biba) { - if (mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) - if (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_EQUAL) + if (mac_biba->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) + if (mac_biba->mb_effective.mbe_type == MAC_BIBA_TYPE_EQUAL) return (1); if (mac_biba->mb_flags & MAC_BIBA_FLAG_RANGE) { @@ -322,8 +323,8 @@ MAC_BIBA_FLAGS_BOTH, ("mac_biba_subject_privileged: subject doesn't have both labels")); - /* If the single is EQUAL, it's ok. */ - if (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_EQUAL) + /* If the effective is EQUAL, it's ok. */ + if (mac_biba->mb_effective.mbe_type == MAC_BIBA_TYPE_EQUAL) return (0); /* If either range endpoint is EQUAL, it's ok. */ @@ -341,30 +342,30 @@ } static int -mac_biba_high_single(struct mac_biba *mac_biba) +mac_biba_high_effective(struct mac_biba *mac_biba) { - KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, - ("mac_biba_equal_single: mac_biba not single")); + KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) != 0, + ("mac_biba_equal_effective: mac_biba not effective")); - return (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_HIGH); + return (mac_biba->mb_effective.mbe_type == MAC_BIBA_TYPE_HIGH); } static int mac_biba_valid(struct mac_biba *mac_biba) { - if (mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) { - switch (mac_biba->mb_single.mbe_type) { + if (mac_biba->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) { + switch (mac_biba->mb_effective.mbe_type) { case MAC_BIBA_TYPE_GRADE: break; case MAC_BIBA_TYPE_EQUAL: case MAC_BIBA_TYPE_HIGH: case MAC_BIBA_TYPE_LOW: - if (mac_biba->mb_single.mbe_grade != 0 || + if (mac_biba->mb_effective.mbe_grade != 0 || !MAC_BIBA_BIT_SET_EMPTY( - mac_biba->mb_single.mbe_compartments)) + mac_biba->mb_effective.mbe_compartments)) return (EINVAL); break; @@ -372,7 +373,7 @@ return (EINVAL); } } else { - if (mac_biba->mb_single.mbe_type != MAC_BIBA_TYPE_UNDEF) + if (mac_biba->mb_effective.mbe_type != MAC_BIBA_TYPE_UNDEF) return (EINVAL); } @@ -444,16 +445,16 @@ } static void -mac_biba_set_single(struct mac_biba *mac_biba, u_short type, u_short grade, +mac_biba_set_effective(struct mac_biba *mac_biba, u_short type, u_short grade, u_char *compartments) { - mac_biba->mb_single.mbe_type = type; - mac_biba->mb_single.mbe_grade = grade; + mac_biba->mb_effective.mbe_type = type; + mac_biba->mb_effective.mbe_grade = grade; if (compartments != NULL) - memcpy(mac_biba->mb_single.mbe_compartments, compartments, - sizeof(mac_biba->mb_single.mbe_compartments)); - mac_biba->mb_flags |= MAC_BIBA_FLAG_SINGLE; + memcpy(mac_biba->mb_effective.mbe_compartments, compartments, + sizeof(mac_biba->mb_effective.mbe_compartments)); + mac_biba->mb_flags |= MAC_BIBA_FLAG_EFFECTIVE; } static void @@ -469,22 +470,22 @@ } static void -mac_biba_copy_single(struct mac_biba *labelfrom, struct mac_biba *labelto) +mac_biba_copy_effective(struct mac_biba *labelfrom, struct mac_biba *labelto) { - KASSERT((labelfrom->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, - ("mac_biba_copy_single: labelfrom not single")); + KASSERT((labelfrom->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) != 0, + ("mac_biba_copy_effective: labelfrom not effective")); - labelto->mb_single = labelfrom->mb_single; - labelto->mb_flags |= MAC_BIBA_FLAG_SINGLE; + labelto->mb_effective = labelfrom->mb_effective; + labelto->mb_flags |= MAC_BIBA_FLAG_EFFECTIVE; } static void mac_biba_copy(struct mac_biba *source, struct mac_biba *dest) { - if (source->mb_flags & MAC_BIBA_FLAG_SINGLE) - mac_biba_copy_single(source, dest); + if (source->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) + mac_biba_copy_effective(source, dest); if (source->mb_flags & MAC_BIBA_FLAG_RANGE) mac_biba_copy_range(source, dest); } @@ -632,8 +633,8 @@ mac_biba_to_string(struct sbuf *sb, struct mac_biba *mac_biba) { - if (mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) { - if (mac_biba_element_to_string(sb, &mac_biba->mb_single) + if (mac_biba->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) { + if (mac_biba_element_to_string(sb, &mac_biba->mb_effective) == -1) return (EINVAL); } @@ -768,12 +769,12 @@ static int mac_biba_parse(struct mac_biba *mac_biba, char *string) { - char *rangehigh, *rangelow, *single; + char *rangehigh, *rangelow, *effective; int error; - single = strsep(&string, "("); - if (*single == '\0') - single = NULL; + effective = strsep(&string, "("); + if (*effective == '\0') + effective = NULL; if (string != NULL) { rangelow = strsep(&string, "-"); @@ -794,11 +795,12 @@ ("mac_biba_parse: range mismatch")); bzero(mac_biba, sizeof(*mac_biba)); - if (single != NULL) { - error = mac_biba_parse_element(&mac_biba->mb_single, single); + if (effective != NULL) { + error = mac_biba_parse_element(&mac_biba->mb_effective, + effective); if (error) return (error); - mac_biba->mb_flags |= MAC_BIBA_FLAG_SINGLE; + mac_biba->mb_flags |= MAC_BIBA_FLAG_EFFECTIVE; } if (rangelow != NULL) { @@ -873,7 +875,7 @@ biba_type = MAC_BIBA_TYPE_EQUAL; else biba_type = MAC_BIBA_TYPE_HIGH; - mac_biba_set_single(mac_biba, biba_type, 0, NULL); + mac_biba_set_effective(mac_biba, biba_type, 0, NULL); } static void @@ -884,7 +886,7 @@ struct mac_biba *mac_biba; mac_biba = SLOT(label); - mac_biba_set_single(mac_biba, MAC_BIBA_TYPE_HIGH, 0, NULL); + mac_biba_set_effective(mac_biba, MAC_BIBA_TYPE_HIGH, 0, NULL); } static void @@ -897,7 +899,7 @@ source = SLOT(cred->cr_label); dest = SLOT(delabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -908,9 +910,9 @@ source = SLOT(cred->cr_label); dest = SLOT(mntlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); dest = SLOT(fslabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -921,9 +923,9 @@ /* Always mount root as high integrity. */ mac_biba = SLOT(fslabel); - mac_biba_set_single(mac_biba, MAC_BIBA_TYPE_HIGH, 0, NULL); + mac_biba_set_effective(mac_biba, MAC_BIBA_TYPE_HIGH, 0, NULL); mac_biba = SLOT(mntlabel); - mac_biba_set_single(mac_biba, MAC_BIBA_TYPE_HIGH, 0, NULL); + mac_biba_set_effective(mac_biba, MAC_BIBA_TYPE_HIGH, 0, NULL); } static void @@ -961,7 +963,7 @@ source = SLOT(delabel); dest = SLOT(vlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static int @@ -981,7 +983,7 @@ MAC_BIBA_EXTATTR_NAME, &buflen, (char *) &temp, curthread); if (error == ENOATTR || error == EOPNOTSUPP) { /* Fall back to the fslabel. */ - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); return (0); } else if (error) return (error); @@ -995,12 +997,12 @@ printf("mac_biba_associate_vnode_extattr: invalid\n"); return (EPERM); } - if ((temp.mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) { - printf("mac_biba_associate_vnode_extattr: not single\n"); + if ((temp.mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_EFFECTIVE) { + printf("mac_biba_associate_vnode_extattr: not effective\n"); return (EPERM); } - mac_biba_copy_single(&temp, dest); + mac_biba_copy_effective(&temp, dest); return (0); } @@ -1013,7 +1015,7 @@ source = SLOT(fslabel); dest = SLOT(vlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static int @@ -1030,12 +1032,12 @@ source = SLOT(cred->cr_label); dest = SLOT(vlabel); - mac_biba_copy_single(source, &temp); + mac_biba_copy_effective(source, &temp); error = vn_extattr_set(vp, IO_NODELOCKED, MAC_BIBA_EXTATTR_NAMESPACE, MAC_BIBA_EXTATTR_NAME, buflen, (char *) &temp, curthread); if (error == 0) - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); return (error); } @@ -1051,10 +1053,10 @@ bzero(&temp, buflen); source = SLOT(intlabel); - if ((source->mb_flags & MAC_BIBA_FLAG_SINGLE) == 0) + if ((source->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) == 0) return (0); - mac_biba_copy_single(source, &temp); + mac_biba_copy_effective(source, &temp); error = vn_extattr_set(vp, IO_NODELOCKED, MAC_BIBA_EXTATTR_NAMESPACE, MAC_BIBA_EXTATTR_NAME, buflen, (char *) &temp, curthread); @@ -1073,7 +1075,7 @@ source = SLOT(solabel); dest = SLOT(inplabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1085,7 +1087,7 @@ source = SLOT(socketlabel); dest = SLOT(mbuflabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1097,7 +1099,7 @@ source = SLOT(cred->cr_label); dest = SLOT(socketlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1109,7 +1111,7 @@ source = SLOT(cred->cr_label); dest = SLOT(pipelabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1121,7 +1123,7 @@ source = SLOT(cred->cr_label); dest = SLOT(ks_label); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1134,7 +1136,7 @@ source = SLOT(oldsocketlabel); dest = SLOT(newsocketlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1170,7 +1172,7 @@ source = SLOT(mbuflabel); dest = SLOT(socketpeerlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } /* @@ -1187,7 +1189,7 @@ source = SLOT(cred->cr_label); dest = SLOT(msglabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1199,7 +1201,7 @@ source = SLOT(cred->cr_label); dest = SLOT(msqlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1211,7 +1213,7 @@ source = SLOT(cred->cr_label); dest = SLOT(semalabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1223,7 +1225,7 @@ source = SLOT(cred->cr_label); dest = SLOT(shmlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } /* @@ -1239,7 +1241,7 @@ source = SLOT(oldsocketlabel); dest = SLOT(newsocketpeerlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1251,7 +1253,7 @@ source = SLOT(cred->cr_label); dest = SLOT(bpflabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1296,7 +1298,7 @@ p = q; } set: - mac_biba_set_single(dest, type, 0, NULL); + mac_biba_set_effective(dest, type, 0, NULL); mac_biba_set_range(dest, type, 0, NULL, type, 0, NULL); } @@ -1309,7 +1311,7 @@ source = SLOT(fragmentlabel); dest = SLOT(ipqlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1322,7 +1324,7 @@ dest = SLOT(datagramlabel); /* Just use the head, since we require them all to match. */ - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1334,7 +1336,7 @@ source = SLOT(datagramlabel); dest = SLOT(fragmentlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1346,7 +1348,7 @@ source = SLOT(inplabel); dest = SLOT(mlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1378,7 +1380,7 @@ dest = SLOT(mbuflabel); - mac_biba_set_single(dest, MAC_BIBA_TYPE_EQUAL, 0, NULL); + mac_biba_set_effective(dest, MAC_BIBA_TYPE_EQUAL, 0, NULL); } static void @@ -1390,7 +1392,7 @@ source = SLOT(bpflabel); dest = SLOT(mbuflabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1402,7 +1404,7 @@ source = SLOT(ifnetlabel); dest = SLOT(mbuflabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1415,7 +1417,7 @@ source = SLOT(oldmbuflabel); dest = SLOT(newmbuflabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static void @@ -1427,7 +1429,7 @@ source = SLOT(oldmbuflabel); dest = SLOT(newmbuflabel); - mac_biba_copy_single(source, dest); + mac_biba_copy_effective(source, dest); } static int @@ -1439,7 +1441,7 @@ a = SLOT(ipqlabel); b = SLOT(fragmentlabel); - return (mac_biba_equal_single(a, b)); + return (mac_biba_equal_effective(a, b)); } static void @@ -1484,7 +1486,7 @@ dest = SLOT(cred->cr_label); - mac_biba_set_single(dest, MAC_BIBA_TYPE_EQUAL, 0, NULL); + mac_biba_set_effective(dest, MAC_BIBA_TYPE_EQUAL, 0, NULL); mac_biba_set_range(dest, MAC_BIBA_TYPE_LOW, 0, NULL, MAC_BIBA_TYPE_HIGH, 0, NULL); } @@ -1496,7 +1498,7 @@ dest = SLOT(cred->cr_label); - mac_biba_set_single(dest, MAC_BIBA_TYPE_HIGH, 0, NULL); + mac_biba_set_effective(dest, MAC_BIBA_TYPE_HIGH, 0, NULL); mac_biba_set_range(dest, MAC_BIBA_TYPE_LOW, 0, NULL, MAC_BIBA_TYPE_HIGH, 0, NULL); } @@ -1557,7 +1559,7 @@ a = SLOT(bpflabel); b = SLOT(ifnetlabel); - if (mac_biba_equal_single(a, b)) + if (mac_biba_equal_effective(a, b)) return (0); return (EACCES); } @@ -1573,7 +1575,7 @@ /* * If there is a Biba label update for the credential, it may - * be an update of the single, range, or both. + * be an update of the effective, range, or both. */ error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) @@ -1585,20 +1587,20 @@ if (new->mb_flags & MAC_BIBA_FLAGS_BOTH) { /* * If the change request modifies both the Biba label - * single and range, check that the new single will be + * effective and range, check that the new effective will be * in the new range. */ if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) == MAC_BIBA_FLAGS_BOTH && - !mac_biba_single_in_range(new, new)) + !mac_biba_effective_in_range(new, new)) return (EINVAL); /* - * To change the Biba single label on a credential, the - * new single label must be in the current range. + * To change the Biba effective label on a credential, the + * new effective label must be in the current range. */ - if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && - !mac_biba_single_in_range(new, subj)) + if (new->mb_flags & MAC_BIBA_FLAG_EFFECTIVE && + !mac_biba_effective_in_range(new, subj)) return (EPERM); /* @@ -1636,7 +1638,7 @@ obj = SLOT(u2->cr_label); /* XXX: range */ - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (ESRCH); return (0); @@ -1654,7 +1656,7 @@ /* * If there is a Biba label update for the interface, it may - * be an update of the single, range, or both. + * be an update of the effective, range, or both. */ error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) @@ -1682,7 +1684,7 @@ p = SLOT(mbuflabel); i = SLOT(ifnetlabel); - return (mac_biba_single_in_range(p, i) ? 0 : EACCES); + return (mac_biba_effective_in_range(p, i) ? 0 : EACCES); } static int @@ -1697,7 +1699,7 @@ p = SLOT(mlabel); i = SLOT(inplabel); - return (mac_biba_equal_single(p, i) ? 0 : EACCES); + return (mac_biba_equal_effective(p, i) ? 0 : EACCES); } static int @@ -1712,7 +1714,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(msglabel); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -1730,7 +1732,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(msglabel); - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); return (0); @@ -1748,7 +1750,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(msqklabel); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -1766,7 +1768,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(msqklabel); - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); return (0); @@ -1784,7 +1786,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(msqklabel); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -1806,12 +1808,12 @@ switch(cmd) { case IPC_RMID: case IPC_SET: - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); break; case IPC_STAT: - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); break; @@ -1839,7 +1841,7 @@ case IPC_SET: case SETVAL: case SETALL: - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); break; @@ -1849,7 +1851,7 @@ case GETNCNT: case GETZCNT: case GETALL: - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); break; @@ -1873,7 +1875,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(semaklabel); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -1893,11 +1895,11 @@ obj = SLOT(semaklabel); if (accesstype & SEM_R) - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); if (accesstype & SEM_A) - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); return (0); @@ -1915,10 +1917,10 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); if ((shmflg & SHM_RDONLY) == 0) { - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); } @@ -1940,13 +1942,13 @@ switch(cmd) { case IPC_RMID: case IPC_SET: - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); break; case IPC_STAT: case SHM_STAT: - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); break; @@ -1976,7 +1978,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); return (0); @@ -1995,7 +1997,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -2018,7 +2020,7 @@ return (error); obj = SLOT(label); - if (!mac_biba_high_single(obj)) + if (!mac_biba_high_effective(obj)) return (EACCES); return (0); @@ -2050,7 +2052,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(mntlabel); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -2081,7 +2083,7 @@ subj = SLOT(cred->cr_label); obj = SLOT((pipelabel)); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -2099,7 +2101,7 @@ subj = SLOT(cred->cr_label); obj = SLOT((pipelabel)); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -2118,9 +2120,9 @@ /* * If there is a Biba label update for a pipe, it must be a - * single update. + * effective update. */ - error = biba_atmostflags(new, MAC_BIBA_FLAG_SINGLE); + error = biba_atmostflags(new, MAC_BIBA_FLAG_EFFECTIVE); if (error) return (error); @@ -2128,18 +2130,18 @@ * To perform a relabel of a pipe (Biba label or not), Biba must * authorize the relabel. */ - if (!mac_biba_single_in_range(obj, subj)) + if (!mac_biba_effective_in_range(obj, subj)) return (EPERM); /* * If the Biba label is to be changed, authorize as appropriate. */ - if (new->mb_flags & MAC_BIBA_FLAG_SINGLE) { + if (new->mb_flags & MAC_BIBA_FLAG_EFFECTIVE) { /* * To change the Biba label on a pipe, the new pipe label * must be in the subject range. */ - if (!mac_biba_single_in_range(new, subj)) + if (!mac_biba_effective_in_range(new, subj)) return (EPERM); /* @@ -2168,7 +2170,7 @@ subj = SLOT(cred->cr_label); obj = SLOT((pipelabel)); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -2186,7 +2188,7 @@ subj = SLOT(cred->cr_label); obj = SLOT((pipelabel)); - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); return (0); @@ -2204,7 +2206,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(ks_label); - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); return (0); @@ -2222,7 +2224,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(ks_label); - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (EACCES); return (0); @@ -2240,9 +2242,9 @@ obj = SLOT(proc->p_ucred->cr_label); /* XXX: range checks */ - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (ESRCH); - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); return (0); @@ -2260,9 +2262,9 @@ obj = SLOT(proc->p_ucred->cr_label); /* XXX: range checks */ - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (ESRCH); - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); return (0); @@ -2280,9 +2282,9 @@ obj = SLOT(proc->p_ucred->cr_label); /* XXX: range checks */ - if (!mac_biba_dominate_single(obj, subj)) + if (!mac_biba_dominate_effective(obj, subj)) return (ESRCH); - if (!mac_biba_dominate_single(subj, obj)) + if (!mac_biba_dominate_effective(subj, obj)) return (EACCES); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 14 06:37:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43DE416A4D0; Wed, 14 Jul 2004 06:37:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE09916A4CE for ; Wed, 14 Jul 2004 06:37:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCA4F43D58 for ; Wed, 14 Jul 2004 06:37:21 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6E6bLIK092948 for ; Wed, 14 Jul 2004 06:37:21 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6E6bKsM092945 for perforce@freebsd.org; Wed, 14 Jul 2004 06:37:20 GMT (envelope-from marcel@freebsd.org) Date: Wed, 14 Jul 2004 06:37:20 GMT Message-Id: <200407140637.i6E6bKsM092945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 06:37:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=57321 Change 57321 by marcel@marcel_nfs on 2004/07/14 06:36:34 IFC @57318 Affected files ... .. //depot/projects/gdb/bin/expr/expr.1#3 integrate .. //depot/projects/gdb/contrib/top/commands.c#3 integrate .. //depot/projects/gdb/contrib/top/top.X#3 integrate .. //depot/projects/gdb/contrib/top/top.c#5 integrate .. //depot/projects/gdb/etc/services#4 integrate .. //depot/projects/gdb/include/regex.h#2 integrate .. //depot/projects/gdb/lib/libarchive/README#2 integrate .. //depot/projects/gdb/lib/libc/regex/engine.c#2 integrate .. //depot/projects/gdb/lib/libc/regex/regcomp.c#3 integrate .. //depot/projects/gdb/lib/libc/regex/regerror.c#2 integrate .. //depot/projects/gdb/lib/libc/regex/regex.3#4 integrate .. //depot/projects/gdb/lib/libc/regex/regex2.h#3 integrate .. //depot/projects/gdb/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/gdb/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/gdb/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/gdb/lib/libpthread/arch/alpha/include/pthread_md.h#2 integrate .. //depot/projects/gdb/lib/libpthread/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/gdb/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/gdb/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/gdb/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/gdb/lib/libpthread/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/gdb/lib/libpthread/pthread.map#3 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_create.c#3 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_exit.c#2 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_init.c#2 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_priority_queue.c#2 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_private.h#4 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_sig.c#3 integrate .. //depot/projects/gdb/lib/libpthread/thread/thr_spec.c#2 integrate .. //depot/projects/gdb/libexec/atrun/atrun.c#2 integrate .. //depot/projects/gdb/release/Makefile.inc.docports#3 integrate .. //depot/projects/gdb/release/alpha/mkisoimages.sh#3 integrate .. //depot/projects/gdb/release/amd64/mkisoimages.sh#3 integrate .. //depot/projects/gdb/release/i386/mkisoimages.sh#3 integrate .. //depot/projects/gdb/release/ia64/mkisoimages.sh#3 integrate .. //depot/projects/gdb/release/sparc64/mkisoimages.sh#3 integrate .. //depot/projects/gdb/sbin/geom/class/concat/gconcat.8#6 integrate .. //depot/projects/gdb/sbin/geom/class/label/glabel.8#5 integrate .. //depot/projects/gdb/sbin/geom/class/nop/gnop.8#6 integrate .. //depot/projects/gdb/sbin/geom/class/stripe/gstripe.8#7 integrate .. //depot/projects/gdb/sbin/kldunload/kldunload.8#2 integrate .. //depot/projects/gdb/sbin/kldunload/kldunload.c#2 integrate .. //depot/projects/gdb/share/dict/freebsd#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/fe.4#4 integrate .. //depot/projects/gdb/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/gdb/share/man/man9/module.9#2 integrate .. //depot/projects/gdb/share/man/man9/vflush.9#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#12 integrate .. //depot/projects/gdb/sys/alpha/include/ptrace.h#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#19 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/gdb/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/gdb/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/gdb/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/gdb/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/gdb/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/gdb/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/gdb/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/gdb/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/gdb/sys/arm/include/frame.h#2 integrate .. //depot/projects/gdb/sys/arm/include/kdb.h#1 branch .. //depot/projects/gdb/sys/arm/include/pcb.h#2 integrate .. //depot/projects/gdb/sys/arm/include/pmap.h#2 integrate .. //depot/projects/gdb/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/gdb/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/gdb/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/gdb/sys/conf/files#40 integrate .. //depot/projects/gdb/sys/conf/files.i386#22 integrate .. //depot/projects/gdb/sys/conf/files.powerpc#5 integrate .. //depot/projects/gdb/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/gdb/sys/contrib/dev/fla/README#2 delete .. //depot/projects/gdb/sys/contrib/dev/fla/fla.c#4 delete .. //depot/projects/gdb/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/gdb/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/gdb/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/gdb/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/gdb/sys/ddb/db_command.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#26 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cmbat.c#6 integrate .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#19 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/gdb/sys/dev/ata/ata-all.c#11 integrate .. //depot/projects/gdb/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/gdb/sys/dev/dcons/dcons.c#12 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#13 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc.c#6 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/fdc/fdcvar.h#2 integrate .. //depot/projects/gdb/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/gdb/sys/dev/snp/snp.c#7 integrate .. //depot/projects/gdb/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/gdb/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/gdb/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/gdb/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/gdb/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/gdb/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/gdb/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/gdb/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/gdb/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/gdb/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/gdb/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/gdb/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/gdb/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/gdb/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/gdb/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/gdb/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/gdb/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/gdb/sys/geom/label/g_label.c#4 integrate .. //depot/projects/gdb/sys/geom/label/g_label.h#3 integrate .. //depot/projects/gdb/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/gdb/sys/gnu/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/gdb/sys/i386/conf/NOTES#16 integrate .. //depot/projects/gdb/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/gdb/sys/i386/i386/machdep.c#15 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/gdb/sys/ia64/ia64/machdep.c#12 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#10 integrate .. //depot/projects/gdb/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/gdb/sys/kern/init_main.c#5 integrate .. //depot/projects/gdb/sys/kern/init_sysent.c#9 integrate .. //depot/projects/gdb/sys/kern/kern_conf.c#9 integrate .. //depot/projects/gdb/sys/kern/kern_exec.c#10 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#13 integrate .. //depot/projects/gdb/sys/kern/kern_fork.c#12 integrate .. //depot/projects/gdb/sys/kern/kern_kse.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_linker.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_module.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_sig.c#12 integrate .. //depot/projects/gdb/sys/kern/kern_thr.c#9 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#20 integrate .. //depot/projects/gdb/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/gdb/sys/kern/link_elf.c#6 integrate .. //depot/projects/gdb/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/gdb/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/gdb/sys/kern/subr_kdb.c#20 integrate .. //depot/projects/gdb/sys/kern/sys_process.c#7 integrate .. //depot/projects/gdb/sys/kern/syscalls.c#9 integrate .. //depot/projects/gdb/sys/kern/syscalls.master#9 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/gdb/sys/kern/vfs_default.c#6 integrate .. //depot/projects/gdb/sys/kern/vfs_export.c#4 integrate .. //depot/projects/gdb/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/gdb/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/gdb/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/firewire/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/firewire/fwip/Makefile#1 branch .. //depot/projects/gdb/sys/modules/usb/Makefile#3 integrate .. //depot/projects/gdb/sys/net/if_sl.c#9 integrate .. //depot/projects/gdb/sys/netatalk/aarp.c#6 integrate .. //depot/projects/gdb/sys/netatalk/at_control.c#4 integrate .. //depot/projects/gdb/sys/netatalk/at_rmx.c#3 integrate .. //depot/projects/gdb/sys/netatalk/ddp_input.c#5 integrate .. //depot/projects/gdb/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/gdb/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/gdb/sys/netatalk/ddp_usrreq.c#6 integrate .. //depot/projects/gdb/sys/netatalk/ddp_var.h#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_frame_relay.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_socket.c#6 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/gdb/sys/netinet/ip_icmp.c#7 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/gdb/sys/netipx/spx_usrreq.c#6 integrate .. //depot/projects/gdb/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_socket.c#10 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/gdb/sys/pc98/conf/GENERIC#9 integrate .. //depot/projects/gdb/sys/pc98/i386/machdep.c#11 integrate .. //depot/projects/gdb/sys/pc98/pc98/clock.c#7 integrate .. //depot/projects/gdb/sys/pc98/pc98/fd.c#9 integrate .. //depot/projects/gdb/sys/pc98/pc98/fdc_cbus.c#2 integrate .. //depot/projects/gdb/sys/pc98/pc98/fdcvar.h#2 integrate .. //depot/projects/gdb/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/gdb/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/gdb/sys/powerpc/include/db_machdep.h#3 integrate .. //depot/projects/gdb/sys/powerpc/include/kdb.h#1 branch .. //depot/projects/gdb/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/gdb/sys/powerpc/include/pcpu.h#3 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/db_interface.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/locore.S#3 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/pmap.c#10 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/trap_subr.S#3 integrate .. //depot/projects/gdb/sys/rpc/rpcclnt.c#6 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#10 integrate .. //depot/projects/gdb/sys/sys/conf.h#9 integrate .. //depot/projects/gdb/sys/sys/kdb.h#15 integrate .. //depot/projects/gdb/sys/sys/kse.h#2 integrate .. //depot/projects/gdb/sys/sys/linker.h#3 integrate .. //depot/projects/gdb/sys/sys/module.h#2 integrate .. //depot/projects/gdb/sys/sys/mount.h#11 integrate .. //depot/projects/gdb/sys/sys/param.h#20 integrate .. //depot/projects/gdb/sys/sys/proc.h#21 integrate .. //depot/projects/gdb/sys/sys/ptrace.h#3 integrate .. //depot/projects/gdb/sys/sys/signalvar.h#3 integrate .. //depot/projects/gdb/sys/sys/socketvar.h#10 integrate .. //depot/projects/gdb/sys/sys/syscall.h#9 integrate .. //depot/projects/gdb/sys/sys/syscall.mk#9 integrate .. //depot/projects/gdb/sys/sys/sysproto.h#9 integrate .. //depot/projects/gdb/sys/sys/user.h#9 integrate .. //depot/projects/gdb/sys/sys/vnode.h#9 integrate .. //depot/projects/gdb/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/gdb/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/gdb/sys/ufs/ufs/ufs_vfsops.c#3 integrate .. //depot/projects/gdb/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/gdb/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/gdb/usr.bin/gcore/elfcore.c#3 integrate .. //depot/projects/gdb/usr.bin/gprof/gprof.c#4 integrate .. //depot/projects/gdb/usr.bin/m4/main.c#2 integrate .. //depot/projects/gdb/usr.bin/nfsstat/nfsstat.c#2 integrate .. //depot/projects/gdb/usr.bin/nl/nl.1#4 integrate .. //depot/projects/gdb/usr.bin/nl/nl.c#2 integrate .. //depot/projects/gdb/usr.bin/sed/process.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#21 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#10 integrate .. //depot/projects/gdb/usr.bin/top/machine.c#6 integrate .. //depot/projects/gdb/usr.bin/xargs/xargs.c#2 integrate .. //depot/projects/gdb/usr.sbin/mrouted/main.c#2 integrate .. //depot/projects/gdb/usr.sbin/sliplogin/sliplogin.c#3 integrate Differences ... ==== //depot/projects/gdb/bin/expr/expr.1#3 (text+ko) ==== @@ -28,9 +28,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/expr/expr.1,v 1.24 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.25 2004/07/12 10:46:55 tjr Exp $ .\" -.Dd July 3, 2004 +.Dd July 12, 2004 .Dt EXPR 1 .Os .Sh NAME @@ -261,7 +261,3 @@ The .Fl e flag is an extension. -.Sh BUGS -The -.Nm -utility does not recognize multibyte characters. ==== //depot/projects/gdb/contrib/top/commands.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.7 2004/07/08 16:45:55 keramida Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.9 2004/07/12 15:22:44 alfred Exp $ */ /* @@ -70,10 +70,10 @@ fputs("\ d - change number of displays to show\n\ e - list errors generated by last \"kill\" or \"renice\" command\n\ -i - toggle the displaying of idle processes\n\ +i or I - toggle the displaying of idle processes\n\ H - toggle the displaying of threads\n\ -I - same as 'i'\n\ k - kill processes; send a signal to a list of processes\n\ +m - toggle the display between 'cpu' and 'io' modes\n\ n or # - change number of processes to display\n", stdout); #ifdef ORDER if (displaymode == DISP_CPU) @@ -86,6 +86,8 @@ fputs("\ r - renice a process\n\ s - change number of seconds to delay between updates\n\ +S - toggle the displaying of system processes\n\ +t - toggle the display of this process\n\ u - display processes for only one user (+ selects all users)\n\ \n\ \n", stdout); ==== //depot/projects/gdb/contrib/top/top.X#3 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.10 2004/07/01 09:12:38 alfred Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.11 2004/07/12 03:00:50 alfred Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -229,6 +229,9 @@ Change the number of seconds to delay between displays (prompt for new number). .TP +.B S +Toggle the display of system processes. +.TP .B k Send a signal (\*(lqkill\*(rq by default) to a list of processes. This acts similarly to the command ==== //depot/projects/gdb/contrib/top/top.c#5 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.13 2004/07/08 16:45:55 keramida Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.14 2004/07/12 03:00:50 alfred Exp $ */ /* @@ -194,9 +194,9 @@ fd_set readfds; #ifdef ORDER - static char command_chars[] = "\f qh?en#sdkriIutHmo"; + static char command_chars[] = "\f qh?en#sdkriIutHmSo"; #else - static char command_chars[] = "\f qh?en#sdkriIutHm"; + static char command_chars[] = "\f qh?en#sdkriIutHmS"; #endif /* these defines enumerate the "strchr"s of the commands in command_chars */ #define CMD_redraw 0 @@ -218,8 +218,9 @@ #define CMD_selftog 15 #define CMD_thrtog 16 #define CMD_viewtog 17 +#define CMD_viewsys 18 #ifdef ORDER -#define CMD_order 18 +#define CMD_order 19 #endif /* set the buffer for stdout */ @@ -1002,6 +1003,9 @@ d_header = i_header; reset_display(); break; + case CMD_viewsys: + ps.system = !ps.system; + break; #ifdef ORDER case CMD_order: new_message(MT_standout, ==== //depot/projects/gdb/etc/services#4 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.100 2004/07/07 06:15:32 cperciva Exp $ +# $FreeBSD: src/etc/services,v 1.101 2004/07/11 19:20:47 cperciva Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -51,8 +51,8 @@ ftp-data 20/udp #File Transfer [Default Data] ftp 21/tcp #File Transfer [Control] ftp 21/udp #File Transfer [Control] -ssh 22/tcp #Secure Shell Login -ssh 22/udp #Secure Shell Login +ssh 22/tcp #Secure Shell Login +ssh 22/udp #Secure Shell Login telnet 23/tcp telnet 23/udp # 24/tcp any private mail system @@ -91,8 +91,8 @@ ni-ftp 47/udp #NI FTP auditd 48/tcp #Digital Audit Daemon auditd 48/udp #Digital Audit Daemon -tacacs 49/tcp #Login Host Protocol (TACACS) -tacacs 49/udp #Login Host Protocol (TACACS) +tacacs 49/tcp #Login Host Protocol (TACACS) +tacacs 49/udp #Login Host Protocol (TACACS) re-mail-ck 50/tcp #Remote Mail Checking Protocol re-mail-ck 50/udp #Remote Mail Checking Protocol la-maint 51/tcp #IMP Logical Address Maintenance @@ -157,8 +157,8 @@ vettcp 78/udp finger 79/tcp finger 79/udp -http 80/tcp www www-http #World Wide Web HTTP -http 80/udp www www-http #World Wide Web HTTP +http 80/tcp www www-http #World Wide Web HTTP +http 80/udp www www-http #World Wide Web HTTP hosts2-ns 81/tcp #HOSTS2 Name Server hosts2-ns 81/udp #HOSTS2 Name Server xfer 82/tcp #XFER Utility @@ -176,8 +176,8 @@ # 87/tcp any private terminal link #PROBLEMS!=========================================================== # 87/udp any private terminal link -kerberos-sec 88/tcp kerberos # krb5 # Kerberos (v5) -kerberos-sec 88/udp kerberos # krb5 # Kerberos (v5) +kerberos-sec 88/tcp kerberos # krb5 # Kerberos (v5) +kerberos-sec 88/udp kerberos # krb5 # Kerberos (v5) su-mit-tg 89/tcp #SU/MIT Telnet Gateway su-mit-tg 89/udp #SU/MIT Telnet Gateway dnsix 90/tcp #DNSIX Securit Attribute Token Map @@ -211,7 +211,7 @@ acr-nema 104/udp #ACR-NEMA Digital Imag. & Comm. 300 csnet-ns 105/tcp cso-ns cso #Mailbox Name Nameserver csnet-ns 105/udp cso-ns cso #Mailbox Name Nameserver -pop3pw 106/tcp 3com-tsmux #Eudora compatible PW changer +pop3pw 106/tcp 3com-tsmux #Eudora compatible PW changer 3com-tsmux 106/udp rtelnet 107/tcp #Remote Telnet Service rtelnet 107/udp #Remote Telnet Service @@ -285,8 +285,8 @@ emfis-cntl 141/udp #EMFIS Control Service bl-idm 142/tcp #Britton-Lee IDM bl-idm 142/udp #Britton-Lee IDM -imap 143/tcp imap2 imap4 #Interim Mail Access Protocol v2 -imap 143/udp imap2 imap4 #Interim Mail Access Protocol v2 +imap 143/tcp imap2 imap4 #Interim Mail Access Protocol v2 +imap 143/udp imap2 imap4 #Interim Mail Access Protocol v2 NeWS 144/tcp # Window System NeWS 144/udp # Window System #PROBLEMS!============================================================== @@ -384,7 +384,7 @@ qft 189/tcp #Queued File Transport qft 189/udp #Queued File Transport gacp 190/tcp #Gateway Access Control Protocol -gacp 190/udp cacp #Gateway Access Control Protocol +gacp 190/udp cacp #Gateway Access Control Protocol prospero 191/tcp #Prospero Directory Service prospero 191/udp #Prospero Directory Service osu-nms 192/tcp #OSU Network Monitoring System @@ -421,8 +421,8 @@ at-7 207/udp #AppleTalk Unused at-8 208/tcp #AppleTalk Unused at-8 208/udp #AppleTalk Unused -qmtp 209/tcp #The Quick Mail Transfer Protocol -qmtp 209/udp #The Quick Mail Transfer Protocol +qmtp 209/tcp #The Quick Mail Transfer Protocol +qmtp 209/udp #The Quick Mail Transfer Protocol #PROBLEMS!============================================================== #tam 209/tcp #Trivial Authenticated Mail Protocol #tam 209/udp #Trivial Authenticated Mail Protocol @@ -439,8 +439,8 @@ vmpwscs 214/udp softpc 215/tcp #Insignia Solutions softpc 215/udp #Insignia Solutions -CAIlic 216/tcp atls #Computer Associates Int'l License Server -CAIlic 216/udp atls #Computer Associates Int'l License Server +CAIlic 216/tcp atls #Computer Associates Int'l License Server +CAIlic 216/udp atls #Computer Associates Int'l License Server dbase 217/tcp #dBASE Unix dbase 217/udp #dBASE Unix mpp 218/tcp #Netix Message Posting Protocol @@ -476,7 +476,7 @@ set 257/tcp #secure electronic transaction set 257/udp #secure electronic transaction yak-chat 258/tcp #yak winsock personal chat -yak-chat 258/udp #yak winsock personal chat +yak-chat 258/udp #yak winsock personal chat esro-gen 259/tcp #efficient short remote operations esro-gen 259/udp #efficient short remote operations openport 260/tcp @@ -538,11 +538,11 @@ matip-type-b 351/tcp #MATIP Type B matip-type-b 351/udp bhoetty 351/tcp #unassigned but widespread use -bhoetty 351/udp #unassigned but widespread use +bhoetty 351/udp #unassigned but widespread use dtag-ste-sb 352/tcp #DTAG dtag-ste-sb 352/udp #DTAG -bhoedap4 352/tcp #unassigned but widespread use -bhoedap4 352/udp #unassigned but widespread use +bhoedap4 352/tcp #unassigned but widespread use +bhoedap4 352/udp #unassigned but widespread use ndsauth 353/tcp ndsauth 353/udp bh611 354/tcp @@ -567,8 +567,8 @@ rsvp_tunnel 363/udp aurora-cmgr 364/tcp aurora-cmgr 364/udp -dtk 365/tcp #Deception Tool Kit - Fred Cohen -dtk 365/udp #Deception Tool Kit - Fred Cohen +dtk 365/tcp #Deception Tool Kit - Fred Cohen +dtk 365/udp #Deception Tool Kit - Fred Cohen odmr 366/tcp odmr 366/udp mortgageware 367/tcp @@ -910,7 +910,7 @@ utime 519/tcp unixtime utime 519/udp unixtime efs 520/tcp #extended file name server -router 520/udp route routed #local routing process (on site); +router 520/udp route routed #local routing process (on site); # uses variant of Xerox NS routing # information protocol ripng 521/tcp @@ -957,8 +957,8 @@ uucp-rlogin 541/udp commerce 542/tcp commerce 542/udp -klogin 543/tcp # Kerberos (v4/v5) -klogin 543/udp # Kerberos (v4/v5) +klogin 543/tcp # Kerberos (v4/v5) +klogin 543/udp # Kerberos (v4/v5) kshell 544/tcp krcmd # Kerberos (v4/v5) kshell 544/udp krcmd # Kerberos (v4/v5) appleqtcsrvr 545/tcp @@ -1087,14 +1087,14 @@ npmp-gui 611/udp sshell 614/tcp #SSLshell sshell 614/udp -ipp 631/tcp #IPP (Internet Printing Protocol) -ipp 631/udp #IPP (Internet Printing Protocol) +ipp 631/tcp #IPP (Internet Printing Protocol) +ipp 631/udp #IPP (Internet Printing Protocol) ginad 634/tcp ginad 634/udp -ldaps 636/tcp sldap #ldap protocol over TLS/SSL -ldaps 636/udp sldap -aodv 654/tcp #Ad-Hoc On-Demand Distance Vector Routing Protocol -aodv 654/udp #Ad-Hoc On-Demand Distance Vector Routing Protocol +ldaps 636/tcp sldap #ldap protocol over TLS/SSL +ldaps 636/udp sldap +aodv 654/tcp #Ad-Hoc On-Demand Distance Vector Routing Protocol +aodv 654/udp #Ad-Hoc On-Demand Distance Vector Routing Protocol mdqs 666/tcp mdqs 666/udp #PROBLEMS!=============================================== @@ -1123,10 +1123,10 @@ fujitsu-dev 747/udp #Fujitsu Device Control ris-cm 748/tcp #Russell Info Sci Calendar Manager ris-cm 748/udp #Russell Info Sci Calendar Manager -kerberos-adm 749/tcp #Kerberos administration (v5) -kerberos-adm 749/udp #Kerberos administration (v5) -kerberos-iv 750/udp kdc # Kerberos (v4) -kerberos-iv 750/tcp kdc # Kerberos (v4) +kerberos-adm 749/tcp #Kerberos administration (v5) +kerberos-adm 749/udp #Kerberos administration (v5) +kerberos-iv 750/udp kdc # Kerberos (v4) +kerberos-iv 750/tcp kdc # Kerberos (v4) #PROBLEMS!======================================================== #rfile 750/tcp #loadav 750/udp @@ -1141,21 +1141,21 @@ qrh 752/udp rrh 753/tcp rrh 753/udp -krb_prop 754/tcp krb5_prop # kerberos/v5 server propagation +krb_prop 754/tcp krb5_prop # kerberos/v5 server propagation #PROBLEMS!======================================================== -tell 754/tcp #send +tell 754/tcp #send #PROBLEMS!======================================================== -tell 754/udp #send +tell 754/udp #send nlogin 758/tcp nlogin 758/udp con 759/tcp con 759/udp -krbupdate 760/tcp kreg # Kerberos (v4) registration +krbupdate 760/tcp kreg # Kerberos (v4) registration #PROBLEMS!======================================================== ns 760/tcp #PROBLEMS!======================================================== ns 760/udp -kpasswd 761/tcp kpwd # Kerberos (v4) "passwd" +kpasswd 761/tcp kpwd # Kerberos (v4) "passwd" #PROBLEMS!======================================================== rxe 761/tcp #PROBLEMS!======================================================== @@ -1194,25 +1194,25 @@ mdbs_daemon 800/udp device 801/tcp device 801/udp -supfilesrv 871/tcp # for SUP +supfilesrv 871/tcp # for SUP rsync 873/tcp rsync 873/udp accessbuilder 888/tcp accessbuilder 888/udp -swat 901/tcp # samba web configuration tool -rndc 953/tcp # named's rndc control socket -ftps-data 989/tcp # ftp protocol, data, over TLS/SSL +swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket +ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp -ftps 990/tcp # ftp protocol, control, over TLS/SSL +ftps 990/tcp # ftp protocol, control, over TLS/SSL ftps 990/udp -telnets 992/tcp # telnet protocol over TLS/SSL +telnets 992/tcp # telnet protocol over TLS/SSL telnets 992/udp -imaps 993/tcp # imap4 protocol over TLS/SSL +imaps 993/tcp # imap4 protocol over TLS/SSL imaps 993/udp -ircs 994/tcp # irc protocol over TLS/SSL +ircs 994/tcp # irc protocol over TLS/SSL ircs 994/udp -pop3s 995/tcp spop3 # pop3 protocol over TLS/SSL -pop3s 995/udp spop3 +pop3s 995/tcp spop3 # pop3 protocol over TLS/SSL +pop3s 995/udp spop3 vsinet 996/tcp vsinet 996/udp maitrd 997/tcp @@ -1220,7 +1220,7 @@ busboy 998/tcp puparp 998/udp garcon 999/tcp -applix 999/udp #Applix ac +applix 999/udp #Applix ac puprouter 999/tcp puprouter 999/udp cadlock2 1000/tcp @@ -1256,7 +1256,7 @@ kpop 1109/udp #Unofficial nfsd-status 1110/tcp #Cluster status info nfsd-keepalive 1110/udp #Client status info -supfiledbg 1127/tcp # for SUP +supfiledbg 1127/tcp # for SUP nfa 1155/tcp #Network File Access nfa 1155/udp #Network File Access phone 1167/udp #conference calling @@ -1491,34 +1491,34 @@ esl-lm 1455/udp #ESL License Manager dca 1456/tcp dca 1456/udp -valisys-lm 1457/tcp #Valisys License Manager -valisys-lm 1457/udp #Valisys License Manager -nrcabq-lm 1458/tcp #Nichols Research Corp. -nrcabq-lm 1458/udp #Nichols Research Corp. -proshare1 1459/tcp #Proshare Notebook Application -proshare1 1459/udp #Proshare Notebook Application -proshare2 1460/tcp #Proshare Notebook Application -proshare2 1460/udp #Proshare Notebook Application -ibm_wrless_lan 1461/tcp #IBM Wireless LAN -ibm_wrless_lan 1461/udp #IBM Wireless LAN -world-lm 1462/tcp #World License Manager -world-lm 1462/udp #World License Manager +valisys-lm 1457/tcp #Valisys License Manager +valisys-lm 1457/udp #Valisys License Manager +nrcabq-lm 1458/tcp #Nichols Research Corp. +nrcabq-lm 1458/udp #Nichols Research Corp. +proshare1 1459/tcp #Proshare Notebook Application +proshare1 1459/udp #Proshare Notebook Application +proshare2 1460/tcp #Proshare Notebook Application +proshare2 1460/udp #Proshare Notebook Application +ibm_wrless_lan 1461/tcp #IBM Wireless LAN +ibm_wrless_lan 1461/udp #IBM Wireless LAN +world-lm 1462/tcp #World License Manager +world-lm 1462/udp #World License Manager nucleus 1463/tcp nucleus 1463/udp -msl_lmd 1464/tcp #MSL License Manager -msl_lmd 1464/udp #MSL License Manager -pipes 1465/tcp #Pipes Platform -pipes 1465/udp #Pipes Platform mfarlin@peerlogic.com -oceansoft-lm 1466/tcp #Ocean Software License Manager -oceansoft-lm 1466/udp #Ocean Software License Manager +msl_lmd 1464/tcp #MSL License Manager +msl_lmd 1464/udp #MSL License Manager +pipes 1465/tcp #Pipes Platform +pipes 1465/udp #Pipes Platform mfarlin@peerlogic.com +oceansoft-lm 1466/tcp #Ocean Software License Manager +oceansoft-lm 1466/udp #Ocean Software License Manager csdmbase 1467/tcp csdmbase 1467/udp csdm 1468/tcp csdm 1468/udp -aal-lm 1469/tcp #Active Analysis Limited License Manager -aal-lm 1469/udp #Active Analysis Limited License Manager -uaiact 1470/tcp #Universal Analytics -uaiact 1470/udp #Universal Analytics +aal-lm 1469/tcp #Active Analysis Limited License Manager +aal-lm 1469/udp #Active Analysis Limited License Manager +uaiact 1470/tcp #Universal Analytics +uaiact 1470/udp #Universal Analytics csdmbase 1471/tcp csdmbase 1471/udp csdm 1472/tcp @@ -1527,8 +1527,8 @@ openmath 1473/udp telefinder 1474/tcp telefinder 1474/udp -taligent-lm 1475/tcp #Taligent License Manager -taligent-lm 1475/udp #Taligent License Manager +taligent-lm 1475/tcp #Taligent License Manager +taligent-lm 1475/udp #Taligent License Manager clvm-cfg 1476/tcp clvm-cfg 1476/udp ms-sna-server 1477/tcp @@ -1541,12 +1541,12 @@ pacerforum 1480/udp airs 1481/tcp airs 1481/udp -miteksys-lm 1482/tcp #Miteksys License Manager -miteksys-lm 1482/udp #Miteksys License Manager -afs 1483/tcp #AFS License Manager -afs 1483/udp #AFS License Manager -confluent 1484/tcp #Confluent License Manager -confluent 1484/udp #Confluent License Manager +miteksys-lm 1482/tcp #Miteksys License Manager +miteksys-lm 1482/udp #Miteksys License Manager +afs 1483/tcp #AFS License Manager +afs 1483/udp #AFS License Manager +confluent 1484/tcp #Confluent License Manager +confluent 1484/udp #Confluent License Manager lansource 1485/tcp lansource 1485/udp nms_topo_serv 1486/tcp @@ -1575,81 +1575,81 @@ rfx-lm 1497/udp watcom-sql 1498/tcp watcom-sql 1498/udp -fhc 1499/tcp #Federico Heinz Consultora -fhc 1499/udp #Federico Heinz Consultora -vlsi-lm 1500/tcp #VLSI License Manager -vlsi-lm 1500/udp #VLSI License Manager -sas-3 1501/tcp #Satellite-data Acquisition System 3 -sas-3 1501/udp #Satellite-data Acquisition System 3 -shivadiscovery 1502/tcp #Shiva -shivadiscovery 1502/udp #Shiva -imtc-mcs 1503/tcp #Databeam -imtc-mcs 1503/udp #Databeam -evb-elm 1504/tcp #EVB Software Engineering License Manager -evb-elm 1504/udp #EVB Software Engineering License Manager -funkproxy 1505/tcp #Funk Software, Inc. -funkproxy 1505/udp #Funk Software, Inc. -utcd 1506/tcp #Universal Time daemon (utcd) -utcd 1506/udp #Universal Time daemon (utcd) +fhc 1499/tcp #Federico Heinz Consultora +fhc 1499/udp #Federico Heinz Consultora +vlsi-lm 1500/tcp #VLSI License Manager +vlsi-lm 1500/udp #VLSI License Manager +sas-3 1501/tcp #Satellite-data Acquisition System 3 +sas-3 1501/udp #Satellite-data Acquisition System 3 +shivadiscovery 1502/tcp #Shiva +shivadiscovery 1502/udp #Shiva +imtc-mcs 1503/tcp #Databeam +imtc-mcs 1503/udp #Databeam +evb-elm 1504/tcp #EVB Software Engineering License Manager +evb-elm 1504/udp #EVB Software Engineering License Manager +funkproxy 1505/tcp #Funk Software, Inc. +funkproxy 1505/udp #Funk Software, Inc. +utcd 1506/tcp #Universal Time daemon (utcd) +utcd 1506/udp #Universal Time daemon (utcd) symplex 1507/tcp symplex 1507/udp diagmond 1508/tcp diagmond 1508/udp -robcad-lm 1509/tcp #Robcad, Ltd. License Manager -robcad-lm 1509/udp #Robcad, Ltd. License Manager -mvx-lm 1510/tcp #Midland Valley Exploration Ltd. Lic. Man. -mvx-lm 1510/udp #Midland Valley Exploration Ltd. Lic. Man. +robcad-lm 1509/tcp #Robcad, Ltd. License Manager +robcad-lm 1509/udp #Robcad, Ltd. License Manager +mvx-lm 1510/tcp #Midland Valley Exploration Ltd. Lic. Man. +mvx-lm 1510/udp #Midland Valley Exploration Ltd. Lic. Man. 3l-l1 1511/tcp 3l-l1 1511/udp -wins 1512/tcp #Microsoft's Windows Internet Name Service -wins 1512/udp #Microsoft's Windows Internet Name Service -fujitsu-dtc 1513/tcp #Fujitsu Systems Business of America, Inc -fujitsu-dtc 1513/udp #Fujitsu Systems Business of America, Inc -fujitsu-dtcns 1514/tcp #Fujitsu Systems Business of America, Inc -fujitsu-dtcns 1514/udp #Fujitsu Systems Business of America, Inc +wins 1512/tcp #Microsoft's Windows Internet Name Service +wins 1512/udp #Microsoft's Windows Internet Name Service +fujitsu-dtc 1513/tcp #Fujitsu Systems Business of America, Inc +fujitsu-dtc 1513/udp #Fujitsu Systems Business of America, Inc +fujitsu-dtcns 1514/tcp #Fujitsu Systems Business of America, Inc +fujitsu-dtcns 1514/udp #Fujitsu Systems Business of America, Inc ifor-protocol 1515/tcp ifor-protocol 1515/udp -vpad 1516/tcp #Virtual Places Audio data -vpad 1516/udp #Virtual Places Audio data -vpac 1517/tcp #Virtual Places Audio control -vpac 1517/udp #Virtual Places Audio control -vpvd 1518/tcp #Virtual Places Video data -vpvd 1518/udp #Virtual Places Video data -vpvc 1519/tcp #Virtual Places Video control -vpvc 1519/udp #Virtual Places Video control -atm-zip-office 1520/tcp #atm zip office -atm-zip-office 1520/udp #atm zip office -ncube-lm 1521/tcp #nCube License Manager -ncube-lm 1521/udp #nCube License Manager -rna-lm 1522/tcp #Ricardo North America License Manager -rna-lm 1522/udp #Ricardo North America License Manager +vpad 1516/tcp #Virtual Places Audio data +vpad 1516/udp #Virtual Places Audio data +vpac 1517/tcp #Virtual Places Audio control +vpac 1517/udp #Virtual Places Audio control +vpvd 1518/tcp #Virtual Places Video data +vpvd 1518/udp #Virtual Places Video data +vpvc 1519/tcp #Virtual Places Video control +vpvc 1519/udp #Virtual Places Video control +atm-zip-office 1520/tcp #atm zip office +atm-zip-office 1520/udp #atm zip office +ncube-lm 1521/tcp #nCube License Manager +ncube-lm 1521/udp #nCube License Manager +rna-lm 1522/tcp #Ricardo North America License Manager +rna-lm 1522/udp #Ricardo North America License Manager cichild-lm 1523/tcp cichild-lm 1523/udp -ingreslock 1524/tcp #ingres -ingreslock 1524/udp #ingres -prospero-np 1525/tcp #Prospero Directory Service non-priv -prospero-np 1525/udp #Prospero Directory Service non-priv +ingreslock 1524/tcp #ingres +ingreslock 1524/udp #ingres +prospero-np 1525/tcp #Prospero Directory Service non-priv +prospero-np 1525/udp #Prospero Directory Service non-priv #PROBLEMS!======================================================== -orasrv 1525/tcp #oracle -orasrv 1525/udp #oracle +orasrv 1525/tcp #oracle +orasrv 1525/udp #oracle #PROBLEMS!======================================================== -pdap-np 1526/tcp #Prospero Data Access Prot non-priv -pdap-np 1526/udp #Prospero Data Access Prot non-priv -tlisrv 1527/tcp #oracle -tlisrv 1527/udp #oracle +pdap-np 1526/tcp #Prospero Data Access Prot non-priv +pdap-np 1526/udp #Prospero Data Access Prot non-priv +tlisrv 1527/tcp #oracle +tlisrv 1527/udp #oracle mciautoreg 1528/tcp mciautoreg 1528/udp -support 1529/tcp prmsd gnatsd # cygnus bug tracker -coauthor 1529/tcp #oracle -coauthor 1529/udp #oracle +support 1529/tcp prmsd gnatsd # cygnus bug tracker +coauthor 1529/tcp #oracle +coauthor 1529/udp #oracle rap-service 1530/tcp rap-service 1530/udp rap-listen 1531/tcp rap-listen 1531/udp miroconnect 1532/tcp miroconnect 1532/udp -virtual-places 1533/tcp #Virtual Places Software -virtual-places 1533/udp #Virtual Places Software +virtual-places 1533/tcp #Virtual Places Software +virtual-places 1533/udp #Virtual Places Software micromuse-lm 1534/tcp micromuse-lm 1534/udp ampr-info 1535/tcp @@ -1660,8 +1660,8 @@ sdsc-lm 1537/udp 3ds-lm 1538/tcp 3ds-lm 1538/udp -intellistor-lm 1539/tcp #Intellistor License Manager -intellistor-lm 1539/udp #Intellistor License Manager +intellistor-lm 1539/tcp #Intellistor License Manager +intellistor-lm 1539/udp #Intellistor License Manager rds 1540/tcp rds 1540/udp rds2 1541/tcp @@ -1678,12 +1678,12 @@ abbaccuray 1546/udp laplink 1547/tcp laplink 1547/udp -axon-lm 1548/tcp #Axon License Manager -axon-lm 1548/udp #Axon License Manager -shivahose 1549/tcp #Shiva Hose -shivasound 1549/udp #Shiva Sound -3m-image-lm 1550/tcp #Image Storage license manager 3M Company -3m-image-lm 1550/udp #Image Storage license manager 3M Company +axon-lm 1548/tcp #Axon License Manager +axon-lm 1548/udp #Axon License Manager +shivahose 1549/tcp #Shiva Hose +shivasound 1549/udp #Shiva Sound +3m-image-lm 1550/tcp #Image Storage license manager 3M Company +3m-image-lm 1550/udp #Image Storage license manager 3M Company hecmtl-db 1551/tcp hecmtl-db 1551/udp pciarray 1552/tcp @@ -1776,13 +1776,13 @@ wizard 2001/udp #curry globe 2002/tcp globe 2002/udp -cfingerd 2003/tcp #GNU finger +cfingerd 2003/tcp #GNU finger mailbox 2004/tcp -emce 2004/udp #CCWS mm conf +emce 2004/udp #CCWS mm conf berknet 2005/tcp oracle 2005/udp invokator 2006/tcp -raid-cc 2006/udp #raid +raid-cc 2006/udp #raid dectalk 2007/tcp raid-am 2007/udp conf 2008/tcp @@ -1791,7 +1791,7 @@ whosockami 2009/udp search 2010/tcp pipe_server 2010/udp -raid-cc 2011/tcp #raid +raid-cc 2011/tcp #raid servserv 2011/udp ttyinfo 2012/tcp raid-ac 2012/udp @@ -1857,8 +1857,8 @@ #dls 2047/udp dls-monitor 2048/tcp dls-monitor 2048/udp -nfsd 2049/tcp nfs # NFS server daemon -nfsd 2049/udp nfs # NFS server daemon +nfsd 2049/tcp nfs # NFS server daemon +nfsd 2049/udp nfs # NFS server daemon #PROBLEMS!============================================================= #shilp 2049/tcp #shilp 2049/udp @@ -1928,8 +1928,7 @@ bmap 3421/tcp #Bull Apprise portmapper bmap 3421/udp #Bull Apprise portmapper prsvp 3455/tcp #RSVP Port -prsvp 3455/udp #RSVP Port -rsvp-encap 3455/udp #RSVP encapsulated in UDP +prsvp 3455/udp rsvp-encap #RSVP Port vat 3456/tcp #VAT default data vat 3456/udp #VAT default data vat-control 3457/tcp #VAT default control @@ -1948,7 +1947,7 @@ mapper-ws_ethd 3986/udp #MAPPER workstation server netcheque 4008/tcp #NetCheque accounting netcheque 4008/udp #NetCheque accounting -lockd 4045/udp # NFS lock daemon/manager +lockd 4045/udp # NFS lock daemon/manager lockd 4045/tcp nuts_dem 4132/tcp #NUTS Daemon nuts_dem 4132/udp #NUTS Daemon @@ -2102,16 +2101,12 @@ amidxtape 10083/tcp #Amanda tape indexing isode-dua 17007/tcp isode-dua 17007/udp -biimenu 18000/tcp #Beckman Instruments, Inc. -biimenu 18000/udp #Beckman Instruments, Inc. -wnn4 22273/tcp #Wnn4 (Japanese input) -wnn6 22273/tcp #Wnn6 (Japanese input) -wnn4_Cn 22289/tcp #Wnn4 (Chinese input) -wnn6_Cn 22289/tcp #Wnn6 (Chinese input) -wnn4_Kr 22305/tcp #Wnn4 (Korean input) -wnn6_Kr 22305/tcp #Wnn6 (Korean input) -wnn4_Tw 22321/tcp #Wnn4 (Taiwanse input) -wnn6_Tw 22321/tcp #Wnn6 (Taiwanse input) +biimenu 18000/tcp #Beckman Instruments, Inc. +biimenu 18000/udp #Beckman Instruments, Inc. +wnn4 22273/tcp wnn6 #Wnn4 (Japanese input) +wnn4_Cn 22289/tcp wnn6_Cn #Wnn4 (Chinese input) +wnn4_Kr 22305/tcp wnn6_Kr #Wnn4 (Korean input) +wnn4_Tw 22321/tcp wnn6_Tw #Wnn4 (Taiwanse input) wnn6_DS 26208/tcp #Wnn6 (Dserver) -dbbrowse 47557/tcp #Databeam Corporation -dbbrowse 47557/udp #Databeam Corporation +dbbrowse 47557/tcp #Databeam Corporation +dbbrowse 47557/udp #Databeam Corporation ==== //depot/projects/gdb/include/regex.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)regex.h 8.2 (Berkeley) 1/3/94 - * $FreeBSD: src/include/regex.h,v 1.10 2003/12/18 10:41:39 jkh Exp $ + * $FreeBSD: src/include/regex.h,v 1.11 2004/07/12 06:07:26 tjr Exp $ */ #ifndef _REGEX_H_ @@ -92,6 +92,7 @@ #define REG_EMPTY 14 #define REG_ASSERT 15 #define REG_INVARG 16 +#define REG_ILLSEQ 17 #define REG_ATOI 255 /* convert name to number (!) */ #define REG_ITOA 0400 /* convert number to name (!) */ ==== //depot/projects/gdb/lib/libarchive/README#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 14 06:45:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B81C16A4D0; Wed, 14 Jul 2004 06:45:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1024416A4CE for ; Wed, 14 Jul 2004 06:45:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0947C43D2D for ; Wed, 14 Jul 2004 06:45:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6E6jVM2093202 for ; Wed, 14 Jul 2004 06:45:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6E6jVml093199 for perforce@freebsd.org; Wed, 14 Jul 2004 06:45:31 GMT (envelope-from marcel@freebsd.org) Date: Wed, 14 Jul 2004 06:45:31 GMT Message-Id: <200407140645.i6E6jVml093199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 06:45:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=57322 Change 57322 by marcel@marcel_nfs on 2004/07/14 06:44:57 Diff reduction. Remove the last of the powerpc changes I had on this branch. Affected files ... .. //depot/projects/gdb/sys/powerpc/powermac/pswitch.c#4 edit Differences ... ==== //depot/projects/gdb/sys/powerpc/powermac/pswitch.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -138,5 +137,9 @@ dev = (device_t)arg; - kdb_enter(device_get_nameunit(dev)); +#ifdef DDB + Debugger(device_get_nameunit(dev)); +#else + device_printf(dev, "close, but no debugger\n"); +#endif } From owner-p4-projects@FreeBSD.ORG Wed Jul 14 11:49:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7376116A4D0; Wed, 14 Jul 2004 11:49:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DBF216A4CE for ; Wed, 14 Jul 2004 11:49:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 437A343D39 for ; Wed, 14 Jul 2004 11:49:49 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6EBnnoK003278 for ; Wed, 14 Jul 2004 11:49:49 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6EBnmgE003275 for perforce@freebsd.org; Wed, 14 Jul 2004 11:49:48 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 14 Jul 2004 11:49:48 GMT Message-Id: <200407141149.i6EBnmgE003275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 11:49:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=57339 Change 57339 by davidxu@davidxu_alona on 2004/07/14 11:49:37 IFC @57334 Affected files ... .. //depot/projects/davidxu_ksedbg/src/bin/expr/expr.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex.3#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/alpha/include/pthread_md.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/pthread.map#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_exit.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_priority_queue.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#8 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_sig.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_spec.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/concat/gconcat.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/nop/gnop.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/class/stripe/gstripe.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/kldunload/kldunload.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/kldunload/kldunload.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/dict/freebsd#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/module.9#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.i386#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_isa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdcvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#10 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#12 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/firewire/fwip/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/modules/usb/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_sl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/i386/machdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/clock.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fd.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fdc_cbus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/fdcvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/db_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/kdb.h#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/locore.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/event.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/eventvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/linker.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/module.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/socketvar.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/nl/nl.1#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/nl/nl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/compile.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/defs.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/misc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/process.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/sed.1#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/read.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tr/cmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tr/cset.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tr/cset.h#2 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/bin/expr/expr.1#3 (text+ko) ==== @@ -28,9 +28,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/expr/expr.1,v 1.24 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.25 2004/07/12 10:46:55 tjr Exp $ .\" -.Dd July 3, 2004 +.Dd July 12, 2004 .Dt EXPR 1 .Os .Sh NAME @@ -261,7 +261,3 @@ The .Fl e flag is an extension. -.Sh BUGS -The -.Nm -utility does not recognize multibyte characters. ==== //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.8 2004/07/12 03:00:50 alfred Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.9 2004/07/12 15:22:44 alfred Exp $ */ /* @@ -70,10 +70,10 @@ fputs("\ d - change number of displays to show\n\ e - list errors generated by last \"kill\" or \"renice\" command\n\ -i - toggle the displaying of idle processes\n\ +i or I - toggle the displaying of idle processes\n\ H - toggle the displaying of threads\n\ -I - same as 'i'\n\ k - kill processes; send a signal to a list of processes\n\ +m - toggle the display between 'cpu' and 'io' modes\n\ n or # - change number of processes to display\n", stdout); #ifdef ORDER if (displaymode == DISP_CPU) @@ -87,6 +87,7 @@ r - renice a process\n\ s - change number of seconds to delay between updates\n\ S - toggle the displaying of system processes\n\ +t - toggle the display of this process\n\ u - display processes for only one user (+ selects all users)\n\ \n\ \n", stdout); ==== //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex.3#5 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)regex.3 8.4 (Berkeley) 3/20/94 -.\" $FreeBSD: src/lib/libc/regex/regex.3,v 1.16 2004/07/12 06:07:26 tjr Exp $ +.\" $FreeBSD: src/lib/libc/regex/regex.3,v 1.17 2004/07/12 11:03:42 tjr Exp $ .\" .Dd July 12, 2004 .Dt REGEX 3 @@ -727,5 +727,3 @@ .Pp The implementation of word-boundary matching is a bit of a kludge, and bugs may lurk in combinations of word-boundary matching and anchoring. -.Pp -The current implementation does not recognize multibyte characters. ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/alpha/include/pthread_md.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.3 2003/09/26 06:53:54 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.4 2004/07/13 22:54:22 davidxu Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -218,14 +218,27 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; + _tcb_set(kcb, tcb); - if (setmbox != 0) - _alpha_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _alpha_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - 0, NULL); + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox != 0) + _alpha_restore_context( + &tcb->tcb_tmbx.tm_context.uc_mcontext, + (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _alpha_restore_context( + &tcb->tcb_tmbx.tm_context.uc_mcontext, + 0, NULL); + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + /* We should not reach here. */ return (-1); } ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.5 2003/10/23 06:12:57 peter Exp $ + * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.6 2004/07/13 22:54:22 davidxu Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -236,22 +236,22 @@ _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { extern int _libkse_debug; - mcontext_t *mc; if ((kcb == NULL) || (tcb == NULL)) return (-1); kcb->kcb_curtcb = tcb; - mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; if (_libkse_debug == 0) { tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox != 0) - _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + _amd64_restore_context( + &tcb->tcb_tmbx.tm_context.uc_mcontext, + (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); else - _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - 0, NULL); + _amd64_restore_context( + &tcb->tcb_tmbx.tm_context.uc_mcontext, + 0, NULL); /* We should not reach here. */ } else { if (setmbox) ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/arm/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.1 2004/05/14 12:21:29 cognet Exp $ + * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.3 2004/07/14 00:58:53 davidxu Exp $ */ /* @@ -227,15 +227,25 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; mcontext_t *mc; _tcb_set(kcb, tcb); mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; - if (setmbox) - _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _thr_setcontext(mc, 0, NULL); + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox) + _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _thr_setcontext(mc, 0, NULL); + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + /* We should not reach here. */ return (-1); } ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.7 2003/09/19 23:28:13 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.8 2004/07/13 22:54:23 davidxu Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -238,12 +238,10 @@ _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { extern int _libkse_debug; - mcontext_t *mc; if ((kcb == NULL) || (tcb == NULL)) return (-1); kcb->kcb_curtcb = tcb; - mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; if (_libkse_debug == 0) { tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox != 0) @@ -253,7 +251,6 @@ else _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, 0, NULL); - /* We should not reach here. */ } else { if (setmbox) kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); @@ -261,6 +258,7 @@ kse_switchin(&tcb->tcb_tmbx, 0); } + /* We should not reach here. */ return (-1); } ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/sparc64/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/sparc64/include/pthread_md.h,v 1.1 2003/10/09 02:32:28 deischen Exp $ + * $FreeBSD: src/lib/libpthread/arch/sparc64/include/pthread_md.h,v 1.2 2004/07/13 22:54:23 davidxu Exp $ */ /* @@ -227,15 +227,25 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; mcontext_t *mc; _tcb_set(kcb, tcb); mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; - if (setmbox) - _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _thr_setcontext(mc, 0, NULL); + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox) + _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _thr_setcontext(mc, 0, NULL); + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + /* We should not reach here. */ return (-1); } ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/pthread.map#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.10 2004/02/10 05:36:09 deischen Exp $ +# $FreeBSD: src/lib/libpthread/pthread.map,v 1.11 2004/07/13 22:52:53 davidxu Exp $ LIBTHREAD_1_0 { global: ___creat; ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.54 2004/06/12 07:40:01 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.55 2004/07/13 22:53:56 davidxu Exp $ */ #include #include ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_exit.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_exit.c,v 1.35 2003/09/14 22:52:16 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_exit.c,v 1.36 2004/07/13 22:49:58 davidxu Exp $ */ #include #include ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.62 2003/11/29 14:10:02 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.63 2004/07/13 22:51:03 davidxu Exp $ */ /* Allocate space for global thread variables here: */ ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.106 2004/04/08 23:16:21 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.107 2004/07/13 22:49:58 davidxu Exp $"); #include #include ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_priority_queue.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_priority_queue.c,v 1.14 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_priority_queue.c,v 1.15 2004/07/13 22:49:58 davidxu Exp $ */ #include #include ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.114 2004/06/12 07:40:01 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.115 2004/07/13 22:49:58 davidxu Exp $ */ #ifndef _THR_PRIVATE_H ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_sig.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.78 2004/06/12 07:40:01 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.79 2004/07/13 22:52:11 davidxu Exp $ */ #include #include ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_spec.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_spec.c,v 1.21 2003/08/20 02:34:14 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_spec.c,v 1.22 2004/07/13 22:49:58 davidxu Exp $ */ #include #include ==== //depot/projects/davidxu_ksedbg/src/sbin/geom/class/concat/gconcat.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.6 2004/07/07 21:00:56 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.7 2004/07/13 12:32:20 pjd Exp $ .\" .Dd May 21, 2004 .Dt GCONCAT 8 @@ -137,6 +137,22 @@ .It Fl v Be more verbose. .El +.Sh SYSCTL VARIABLES +The following +.Xr sysctl 8 +variables can be used to control the behavior of the +.Nm CONCAT +GEOM class. +The default value is shown next to each variable. +.Bl -tag -width indent +.It Va kern.geom.concat.debug : No 0 +Debug level of the +.Nm CONCAT +GEOM class. +This can be set to a number between 0 and 3, both included. +If set to 0 minimal debug information is printed, and if set to 3 the +maximum amount of debug information in printed. +.El .Sh EXAMPLES The following example shows how to configure four disks for automatic concatenation, create a file system on it, and mount it: @@ -153,9 +169,11 @@ Exit status is 0 on success, and 1 if the command fails. .Sh SEE ALSO .Xr geom 4 , +.Xr loader.conf 5 , .Xr geom 8 , .Xr mount 8 , .Xr newfs 8 , +.Xr sysctl 8 , .Xr umount 8 , .Xr vinum 8 .Sh HISTORY ==== //depot/projects/davidxu_ksedbg/src/sbin/geom/class/label/glabel.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/label/glabel.8,v 1.4 2004/07/07 21:00:56 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/label/glabel.8,v 1.5 2004/07/13 12:32:20 pjd Exp $ .\" .Dd July 2, 2004 .Dt GLABEL 8 @@ -160,6 +160,22 @@ .It Fl v Be more verbose. .El +.Sh SYSCTL VARIABLES +The following +.Xr sysctl 8 +variables can be used to control the behavior of the +.Nm LABEL +GEOM class. +The default value is shown next to each variable. +.Bl -tag -width indent +.It Va kern.geom.label.debug : No 0 +Debug level of the +.Nm LABEL +GEOM class. +This can be set to a number between 0 and 2, both included. +If set to 0 minimal debug information is printed, and if set to 2 the +maximum amount of debug information in printed. +.El .Sh EXAMPLES The following example shows how to set up a label for disk .Dq Li da2 , @@ -183,9 +199,11 @@ Exit status is 0 on success, and 1 if the command fails. .Sh SEE ALSO .Xr geom 4 , +.Xr loader.conf 5 , .Xr geom 8 , .Xr mount 8 , .Xr newfs 8 , +.Xr sysctl 8 , .Xr tunefs 8 , .Xr umount 8 .Sh HISTORY ==== //depot/projects/davidxu_ksedbg/src/sbin/geom/class/nop/gnop.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.8 2004/07/07 21:00:56 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.9 2004/07/13 12:32:20 pjd Exp $ .\" .Dd May 21, 2004 .Dt GNOP 8 @@ -106,6 +106,22 @@ .It Fl v Be more verbose. .El +.Sh SYSCTL VARIABLES +The following +.Xr sysctl 8 +variables can be used to control the behavior of the +.Nm NOP +GEOM class. +The default value is shown next to each variable. +.Bl -tag -width indent +.It Va kern.geom.nop.debug : No 0 +Debug level of the +.Nm NOP +GEOM class. +This can be set to a number between 0 and 2, both included. +If set to 0 minimal debug information is printed, and if set to 2 the +maximum amount of debug information in printed. +.El .Sh EXAMPLES The following example shows how to create a transparent provider for disk .Pa /dev/da0 ==== //depot/projects/davidxu_ksedbg/src/sbin/geom/class/stripe/gstripe.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.8 2004/07/09 14:41:51 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.10 2004/07/13 12:30:11 pjd Exp $ .\" .Dd May 21, 2004 .Dt GSTRIPE 8 @@ -141,6 +141,43 @@ .It Fl v Be more verbose. .El +.Sh SYSCTL VARIABLES +The following +.Xr sysctl 8 +variables can be used to control the behavior of the +.Nm STRIPE +GEOM class. +The default value is shown next to each variable. +.Bl -tag -width indent +.It Va kern.geom.stripe.debug : No 0 +Debug level of the +.Nm STRIPE +GEOM class. +This can be set to a number between 0 and 3, both included. +If set to 0 minimal debug information is printed, and if set to 3 the +maximum amount of debug information in printed. +.It Va kern.geom.stripe.fast : No 1 +If set to a non-zero value enable +.Dq "fast mode" +instead of the normal +.Dq "economic mode" . +Compared to +.Dq "economic mode" +.Dq "fast mode" +uses more memory, but it is much faster for smaller stripe sizes. +If enough memory cannot be allocated +.Nm STRIPE +will fall back to +.Dq "economic mode" . +.It Va kern.geom.stripe.maxmem : No 1310720 +Maximum amount of memory that can be consumed by +.Dq "fast mode" +(in bytes). +This +.Xr sysctl 8 +variable is read-only and can only be set as a tunable in +.Xr loader.conf 5 . +.El .Sh EXAMPLES The following example shows how to set up striped device from four disks for automatic configuration, create a file system on it, and mount it: @@ -157,9 +194,11 @@ Exit status is 0 on success, and 1 if the command fails. .Sh SEE ALSO .Xr geom 4 , +.Xr loader.conf 5 , .Xr geom 8 , .Xr mount 8 , .Xr newfs 8 , +.Xr sysctl 8 , .Xr umount 8 , .Xr vinum 8 .Sh HISTORY ==== //depot/projects/davidxu_ksedbg/src/sbin/kldunload/kldunload.8#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/kldunload/kldunload.8,v 1.12 2002/07/06 19:33:23 charnier Exp $ +.\" $FreeBSD: src/sbin/kldunload/kldunload.8,v 1.13 2004/07/13 19:36:58 phk Exp $ .\" .Dd April 25, 1997 .Dt KLDUNLOAD 8 @@ -33,9 +33,11 @@ .Nd unload a file from the kernel .Sh SYNOPSIS .Nm +.Op Fl f .Op Fl v .Fl i Ar id .Nm +.Op Fl f .Op Fl v .Op Fl n .Ar name @@ -47,6 +49,11 @@ .Pp The following options are available: .Bl -tag -width indentXX +.It Fl f +Force the unload. +This ignores error returns to MOD_QUISCE from the module and implies +that the module should be unloaded even if it is currently in use. +The users are left to cope as best they can. .It Fl v Be more verbose. .It Fl i Ar id ==== //depot/projects/davidxu_ksedbg/src/sbin/kldunload/kldunload.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.13 2003/05/03 18:41:57 obrien Exp $"); +__FBSDID("$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.14 2004/07/13 19:36:58 phk Exp $"); #include #include @@ -48,10 +48,14 @@ int c; int verbose = 0; int fileid = 0; + int force = LINKER_UNLOAD_NORMAL; char* filename = NULL; - while ((c = getopt(argc, argv, "i:n:v")) != -1) + while ((c = getopt(argc, argv, "fi:n:v")) != -1) switch (c) { + case 'f': + force = LINKER_UNLOAD_FORCE; + break; case 'i': fileid = atoi(optarg); if (!fileid) @@ -93,7 +97,7 @@ printf("Unloading %s, id=%d\n", stat.name, fileid); } - if (kldunload(fileid) < 0) + if (kldunloadf(fileid, force) < 0) err(1, "can't unload file"); return 0; ==== //depot/projects/davidxu_ksedbg/src/share/dict/freebsd#2 (text+ko) ==== @@ -1,15 +1,30 @@ -$FreeBSD: src/share/dict/freebsd,v 1.6 2003/04/20 21:36:12 murray Exp $ +$FreeBSD: src/share/dict/freebsd,v 1.9 2004/07/14 07:10:15 murray Exp $ ABI +ACL ACPI +ADSL +AGP AMD +API +APIC +ATAPI +ATX +AVI AXP +AfterStep AlphaBIOS Appletalk +Athlon +BIBA BOFs +BOOTP BSDCon BSDi Barnes +BeOS +Bluetooth Border's +Broadcom CDROM CDROMs CDs @@ -25,11 +40,19 @@ DEVBUF DNS DTD +DVD +DVI Dilbert DocBook +EIDE +EISA +Ensoniq Ermilov +Estonia +EtherExpress Euro -Firewire +FDDI +FireWire FreeBSD FreeBSD's Fry's @@ -45,33 +68,48 @@ IBCS IPsec IRC +IRQ ISA ISBN ISDN ISP Iomega +Itanium JDK +JVM JadeTeX KDE KLD +KOffice KSE Kennaway Kerberos Kerneltrap Kuriyama +LAN LDAP +LGPL +LLC +LOMAC +LPD Leffler Lehey LinuxDoc +MBR +MBone MFC MIPS MP +MPEG +MTA +MUA Mallett Matrox McKusick Mozilla MySQL NAI +NDIS NIC NIS NSS @@ -89,9 +127,14 @@ OSnews OpenBSD OpenGL +OpenOffice +OpenSSH +OpenSSL PAE PCI PDF +PID +PLIP PPC PR PXE @@ -101,14 +144,26 @@ PostScript Postgres PowerPC +Qt +Quicktime +RSA +RealPlayer +RedHat +Romania SCO SGI SMP SNMP +SSH +SSL +SQL SVR Shumway Slackware +Slovenia +SoftUpdates Sony +SoundBlaster StarOffice Stokely StrongArm @@ -118,38 +173,61 @@ TRB Tcl Tk +TrueType TrustedBSD UFS UltraSPARC +Ukraine VFS VM Valentino Vaschetto Vidrine >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 14 20:47:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E786016A4D0; Wed, 14 Jul 2004 20:47:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2CD016A4CE for ; Wed, 14 Jul 2004 20:47:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA55543D31 for ; Wed, 14 Jul 2004 20:47:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6EKlf9U019504 for ; Wed, 14 Jul 2004 20:47:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6EKlfH9019501 for perforce@freebsd.org; Wed, 14 Jul 2004 20:47:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 14 Jul 2004 20:47:41 GMT Message-Id: <200407142047.i6EKlfH9019501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 20:47:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=57356 Change 57356 by rwatson@rwatson_tislabs on 2004/07/14 20:47:13 Integrate netperf_socket from FreeBSD CVS: - Alpha pmap locking. - More kdb cleanup, firewire. - kldunloadf(). - vfs_root() takes a thread. - KSE debugging related pieces. - 4BSD preemption bug fix. - If M_DONTWAIT in socket upcall, defer read to nfsd. - The great floppy disk escapade continues. - A variety of powerpc changes. - UFS1 extattr fix. Loop back rwatson_netperf locking: - ng_eiface, ng_fec, ng_iface, ng_ppp, ng_pppoe, ng_tty global locking. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#11 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ptrace.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#11 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/frame.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/kdb.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/pcb.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/pmap.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/netperf_socket/sys/conf/files#40 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#21 integrate .. //depot/projects/netperf_socket/sys/conf/files.powerpc#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/fla/README#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/fla/fla.c#4 delete .. //depot/projects/netperf_socket/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#31 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdcvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.h#3 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#22 integrate .. //depot/projects/netperf_socket/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_linker.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_module.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/link_elf.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/sys_process.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#10 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#33 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/netperf_socket/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/usb/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/net/if_sl.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#16 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_fec.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#11 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#15 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#7 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#10 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fdc_cbus.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fdcvar.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/db_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/kdb.h#1 branch .. //depot/projects/netperf_socket/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/pcpu.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/locore.S#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/trap.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/trap_subr.S#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/sys/event.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/eventvar.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/kse.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/linker.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/module.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#17 integrate .. //depot/projects/netperf_socket/sys/sys/ptrace.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/signalvar.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#22 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#10 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#10 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#8 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#11 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.154 2004/07/08 07:44:55 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.157 2004/07/14 05:49:44 alc Exp $"); #include #include @@ -745,11 +745,18 @@ vm_paddr_t pmap_extract(pmap_t pmap, vm_offset_t va) { - pt_entry_t* pte = pmap_lev3pte(pmap, va); - if (pte) - return alpha_ptob(ALPHA_PTE_TO_PFN(*pte)); - else - return 0; + pt_entry_t *pte; + vm_paddr_t pa; + + pa = 0; + if (pmap == NULL) + return (pa); + PMAP_LOCK(pmap); + pte = pmap_lev3pte(pmap, va); + if (pte != NULL) + pa = alpha_ptob(ALPHA_PTE_TO_PFN(*pte)); + PMAP_UNLOCK(pmap); + return (pa); } /* @@ -1529,6 +1536,7 @@ { register pt_entry_t *ptq; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); ptq = pmap_lev3pte(pmap, va); /* @@ -1560,8 +1568,12 @@ if (pmap == NULL) return; + /* + * Perform an unsynchronized read. This is, however, safe. + */ if (pmap->pm_stats.resident_count == 0) return; + PMAP_LOCK(pmap); /* * special handling of removing one page. a very @@ -1570,7 +1582,7 @@ */ if (sva + PAGE_SIZE == eva) { pmap_remove_page(pmap, sva); - return; + goto out; } for (va = sva; va < eva; va = nva) { @@ -1587,6 +1599,8 @@ pmap_remove_page(pmap, va); nva = va + PAGE_SIZE; } +out: + PMAP_UNLOCK(pmap); } /* @@ -2185,7 +2199,6 @@ pt_entry_t *pte, tpte; vm_page_t m; pv_entry_t pv, npv; - int s; #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) { @@ -2194,7 +2207,7 @@ } #endif - s = splvm(); + vm_page_lock_queues(); PMAP_LOCK(pmap); for(pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; @@ -2228,6 +2241,10 @@ pv->pv_pmap->pm_stats.resident_count--; + if ((tpte & PG_FOW) == 0) + if (pmap_track_modified(pv->pv_va)) + vm_page_dirty(m); + npv = TAILQ_NEXT(pv, pv_plist); TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); @@ -2240,9 +2257,9 @@ pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } - splx(s); pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); + vm_page_unlock_queues(); } /* @@ -2378,21 +2395,25 @@ { pv_entry_t pv; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) - return FALSE; + return (rv); /* * A page is modified if any mapping has had its PG_FOW flag * cleared. */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); - if (!(*pte & PG_FOW)) - return 1; + rv = !(*pte & PG_FOW); + PMAP_UNLOCK(pv->pv_pmap); + if (rv) + break; } - - return 0; + return (rv); } /* @@ -2405,14 +2426,17 @@ pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) { pt_entry_t *pte; + boolean_t rv; - if (!pmap_pte_v(pmap_lev1pte(pmap, addr)) || - !pmap_pte_v(pmap_lev2pte(pmap, addr))) - return (FALSE); - pte = vtopte(addr); - if (*pte) - return (FALSE); - return (TRUE); + rv = FALSE; + PMAP_LOCK(pmap); + if (pmap_pte_v(pmap_lev1pte(pmap, addr)) && + pmap_pte_v(pmap_lev2pte(pmap, addr))) { + pte = vtopte(addr); + rv = *pte == 0; + } + PMAP_UNLOCK(pmap); + return (rv); } /* @@ -2611,30 +2635,30 @@ pmap_t pmap; vm_offset_t addr; { - pt_entry_t *pte; + pt_entry_t *ptep, pte; int val = 0; - pte = pmap_lev3pte(pmap, addr); - if (pte == 0) { - return 0; - } + PMAP_LOCK(pmap); + ptep = pmap_lev3pte(pmap, addr); + pte = (ptep != NULL) ? *ptep : 0; + PMAP_UNLOCK(pmap); - if (pmap_pte_v(pte)) { + if (pte & PG_V) { vm_page_t m; vm_offset_t pa; val = MINCORE_INCORE; - if ((*pte & PG_MANAGED) == 0) + if ((pte & PG_MANAGED) == 0) return val; - pa = pmap_pte_pa(pte); + pa = alpha_ptob(ALPHA_PTE_TO_PFN(pte)); m = PHYS_TO_VM_PAGE(pa); /* * Modified by us */ - if ((*pte & PG_FOW) == 0) + if ((pte & PG_FOW) == 0) val |= MINCORE_MODIFIED|MINCORE_MODIFIED_OTHER; else { /* @@ -2648,7 +2672,7 @@ /* * Referenced by us */ - if ((*pte & (PG_FOR | PG_FOE)) == 0) + if ((pte & (PG_FOR | PG_FOE)) == 0) val |= MINCORE_REFERENCED|MINCORE_REFERENCED_OTHER; else { /* ==== //depot/projects/netperf_socket/sys/alpha/include/ptrace.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.11 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.12 2004/07/13 16:11:04 kensmith Exp $ */ #ifndef _MACHINE_PTRACE_H_ @@ -35,7 +35,6 @@ #ifdef _KERNEL #define FIX_SSTEP(p) ptrace_clear_single_step(p) -int ptrace_clear_single_step(struct thread *_p); #endif #endif ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.613 2004/07/10 22:39:17 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.614 2004/07/13 07:22:54 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1303,6 +1303,13 @@ } int +ptrace_clear_single_step(struct thread *td) +{ + td->td_frame->tf_rflags &= ~PSL_T; + return (0); +} + +int fill_regs(struct thread *td, struct reg *regs) { struct pcb *pcb; ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#19 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.482 2004/07/07 16:47:58 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.484 2004/07/14 07:13:33 peter Exp $"); /* * Manages physical address maps. @@ -207,17 +207,17 @@ static pv_entry_t get_pv_entry(void); static void pmap_clear_ptes(vm_page_t m, int bit); -static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); +static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, + vm_offset_t sva, pd_entry_t ptepde); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, - vm_offset_t va); -static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, - vm_page_t mpte, vm_page_t m); + vm_offset_t va, pd_entry_t ptepde); +static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex); -static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); +static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); @@ -334,12 +334,37 @@ } +static __inline pt_entry_t * +pmap_pte_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *ptepde) +{ + pd_entry_t *pde; + pt_entry_t *pte; + + pde = pmap_pde(pmap, va); + if (pde == NULL || (*pde & PG_V) == 0) + return NULL; + *ptepde = *pde; + if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ + return ((pt_entry_t *)pde); + pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); + return (&pte[pmap_pte_index(va)]); +} + + PMAP_INLINE pt_entry_t * vtopte(vm_offset_t va) { u_int64_t mask = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); - return (PTmap + (amd64_btop(va) & mask)); + return (PTmap + ((va >> PAGE_SHIFT) & mask)); +} + +static __inline pd_entry_t * +vtopde(vm_offset_t va) +{ + u_int64_t mask = ((1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); + + return (PDmap + ((va >> PDRSHIFT) & mask)); } static u_int64_t @@ -1034,12 +1059,16 @@ * conditionally free the page, and manage the hold/wire counts. */ static int -pmap_unuse_pt(pmap_t pmap, vm_offset_t va, vm_page_t mpte) +pmap_unuse_pt(pmap_t pmap, vm_offset_t va, pd_entry_t ptepde) { + vm_page_t mpte; if (va >= VM_MAXUSER_ADDRESS) return 0; - +/* XXX this should be an error, all cases should be caught now */ + if (ptepde == 0) + ptepde = *pmap_pde(pmap, va); + mpte = PHYS_TO_VM_PAGE(ptepde & PG_FRAME); return pmap_unwire_pte_hold(pmap, va, mpte); } @@ -1437,7 +1466,7 @@ static int -pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) +pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va, pd_entry_t ptepde) { pv_entry_t pv; int rtval; @@ -1458,7 +1487,7 @@ rtval = 0; if (pv) { - rtval = pmap_unuse_pt(pmap, va, pv->pv_ptem); + rtval = pmap_unuse_pt(pmap, va, ptepde); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; if (TAILQ_FIRST(&m->md.pv_list) == NULL) @@ -1476,14 +1505,13 @@ * (pmap, va). */ static void -pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m) +pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) { pv_entry_t pv; pv = get_pv_entry(); pv->pv_va = va; pv->pv_pmap = pmap; - pv->pv_ptem = mpte; vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); @@ -1496,10 +1524,10 @@ * pmap_remove_pte: do the things to unmap a page in a process */ static int -pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va) +pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va, pd_entry_t ptepde) { pt_entry_t oldpte; - vm_page_t m, mpte; + vm_page_t m; PMAP_LOCK_ASSERT(pmap, MA_OWNED); oldpte = pte_load_clear(ptq); @@ -1527,10 +1555,9 @@ } if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); - return pmap_remove_entry(pmap, m, va); + return pmap_remove_entry(pmap, m, va, ptepde); } else { - mpte = PHYS_TO_VM_PAGE(*pmap_pde(pmap, va) & PG_FRAME); - return pmap_unuse_pt(pmap, va, mpte); + return pmap_unuse_pt(pmap, va, ptepde); } } @@ -1540,13 +1567,14 @@ static void pmap_remove_page(pmap_t pmap, vm_offset_t va) { + pd_entry_t ptepde; pt_entry_t *pte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); - pte = pmap_pte(pmap, va); + pte = pmap_pte_pde(pmap, va, &ptepde); if (pte == NULL || (*pte & PG_V) == 0) return; - pmap_remove_pte(pmap, pte, va); + pmap_remove_pte(pmap, pte, va, ptepde); pmap_invalidate_page(pmap, va); } @@ -1649,7 +1677,7 @@ if (pte == NULL || *pte == 0) continue; anyvalid = 1; - if (pmap_remove_pte(pmap, pte, sva)) + if (pmap_remove_pte(pmap, pte, sva, ptpaddr)) break; } } @@ -1677,6 +1705,7 @@ { register pv_entry_t pv; pt_entry_t *pte, tpte; + pd_entry_t ptepde; #if defined(PMAP_DIAGNOSTIC) /* @@ -1691,7 +1720,7 @@ while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pv->pv_pmap->pm_stats.resident_count--; - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pte = pmap_pte_pde(pv->pv_pmap, pv->pv_va, &ptepde); tpte = pte_load_clear(pte); if (tpte & PG_W) pv->pv_pmap->pm_stats.wired_count--; @@ -1716,7 +1745,7 @@ TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pv->pv_pmap, pv->pv_va, ptepde); PMAP_UNLOCK(pv->pv_pmap); free_pv_entry(pv); } @@ -1849,6 +1878,7 @@ vm_paddr_t pa; register pt_entry_t *pte; vm_paddr_t opa; + pd_entry_t ptepde; pt_entry_t origpte, newpte; vm_page_t mpte; @@ -1882,7 +1912,7 @@ } #endif - pte = pmap_pte(pmap, va); + pte = pmap_pte_pde(pmap, va, &ptepde); /* * Page Directory table entry not valid, we need a new PT page @@ -1948,7 +1978,7 @@ int err; vm_page_lock_queues(); PMAP_LOCK(pmap); - err = pmap_remove_pte(pmap, pte, va); + err = pmap_remove_pte(pmap, pte, va, ptepde); PMAP_UNLOCK(pmap); vm_page_unlock_queues(); if (err) @@ -1962,7 +1992,7 @@ */ if (pmap_initialized && (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { - pmap_insert_entry(pmap, va, mpte, m); + pmap_insert_entry(pmap, va, m); pa |= PG_MANAGED; } @@ -2080,7 +2110,7 @@ * called at interrupt time. */ if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) - pmap_insert_entry(pmap, va, mpte, m); + pmap_insert_entry(pmap, va, m); /* * Increment counters @@ -2331,8 +2361,7 @@ m = PHYS_TO_VM_PAGE(ptetemp & PG_FRAME); *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; - pmap_insert_entry(dst_pmap, addr, - dstmpte, m); + pmap_insert_entry(dst_pmap, addr, m); } else { vm_page_lock_queues(); pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); @@ -2459,7 +2488,7 @@ return; } #endif - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); PMAP_LOCK(pmap); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { @@ -2516,11 +2545,12 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, *vtopde(pv->pv_va)); free_pv_entry(pv); } pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); + vm_page_unlock_queues(); } /* ==== //depot/projects/netperf_socket/sys/amd64/include/pmap.h#11 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.120 2004/06/19 14:58:34 bde Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.121 2004/07/14 07:13:35 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -256,7 +256,6 @@ vm_offset_t pv_va; /* virtual address for mapping */ TAILQ_ENTRY(pv_entry) pv_list; TAILQ_ENTRY(pv_entry) pv_plist; - vm_page_t pv_ptem; /* VM page for pte */ } *pv_entry_t; #ifdef _KERNEL ==== //depot/projects/netperf_socket/sys/arm/arm/db_interface.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.2 2004/07/12 21:25:01 cognet Exp $"); #include "opt_ddb.h" #include @@ -62,36 +62,33 @@ #include #include -static int nil; +static int nil = 0; -db_regs_t ddb_regs; int db_access_und_sp (struct db_variable *, db_expr_t *, int); int db_access_abt_sp (struct db_variable *, db_expr_t *, int); int db_access_irq_sp (struct db_variable *, db_expr_t *, int); -u_int db_fetch_reg (int, db_regs_t *); -int db_trapper __P((u_int, u_int, trapframe_t *, int)); - +#define DB_OFFSET(x) (db_expr_t *)offsetof(struct trapframe, x) struct db_variable db_regs[] = { - { "spsr", (int *)&DDB_REGS->tf_spsr, FCN_NULL, }, - { "r0", (int *)&DDB_REGS->tf_r0, FCN_NULL, }, - { "r1", (int *)&DDB_REGS->tf_r1, FCN_NULL, }, - { "r2", (int *)&DDB_REGS->tf_r2, FCN_NULL, }, - { "r3", (int *)&DDB_REGS->tf_r3, FCN_NULL, }, - { "r4", (int *)&DDB_REGS->tf_r4, FCN_NULL, }, - { "r5", (int *)&DDB_REGS->tf_r5, FCN_NULL, }, - { "r6", (int *)&DDB_REGS->tf_r6, FCN_NULL, }, - { "r7", (int *)&DDB_REGS->tf_r7, FCN_NULL, }, - { "r8", (int *)&DDB_REGS->tf_r8, FCN_NULL, }, - { "r9", (int *)&DDB_REGS->tf_r9, FCN_NULL, }, - { "r10", (int *)&DDB_REGS->tf_r10, FCN_NULL, }, - { "r11", (int *)&DDB_REGS->tf_r11, FCN_NULL, }, - { "r12", (int *)&DDB_REGS->tf_r12, FCN_NULL, }, - { "usr_sp", (int *)&DDB_REGS->tf_usr_sp, FCN_NULL, }, - { "usr_lr", (int *)&DDB_REGS->tf_usr_lr, FCN_NULL, }, - { "svc_sp", (int *)&DDB_REGS->tf_svc_sp, FCN_NULL, }, - { "svc_lr", (int *)&DDB_REGS->tf_svc_lr, FCN_NULL, }, - { "pc", (int *)&DDB_REGS->tf_pc, FCN_NULL, }, + { "spsr", DB_OFFSET(tf_spsr), FCN_NULL, }, + { "r0", DB_OFFSET(tf_r0), FCN_NULL, }, + { "r1", DB_OFFSET(tf_r1), FCN_NULL, }, + { "r2", DB_OFFSET(tf_r2), FCN_NULL, }, + { "r3", DB_OFFSET(tf_r3), FCN_NULL, }, + { "r4", DB_OFFSET(tf_r4), FCN_NULL, }, + { "r5", DB_OFFSET(tf_r5), FCN_NULL, }, + { "r6", DB_OFFSET(tf_r6), FCN_NULL, }, + { "r7", DB_OFFSET(tf_r7), FCN_NULL, }, + { "r8", DB_OFFSET(tf_r8), FCN_NULL, }, + { "r9", DB_OFFSET(tf_r9), FCN_NULL, }, + { "r10", DB_OFFSET(tf_r10), FCN_NULL, }, + { "r11", DB_OFFSET(tf_r11), FCN_NULL, }, + { "r12", DB_OFFSET(tf_r12), FCN_NULL, }, + { "usr_sp", DB_OFFSET(tf_usr_sp), FCN_NULL, }, + { "usr_lr", DB_OFFSET(tf_usr_lr), FCN_NULL, }, + { "svc_sp", DB_OFFSET(tf_svc_sp), FCN_NULL, }, + { "svc_lr", DB_OFFSET(tf_svc_lr), FCN_NULL, }, + { "pc", DB_OFFSET(tf_pc), FCN_NULL, }, { "und_sp", &nil, db_access_und_sp, }, { "abt_sp", &nil, db_access_abt_sp, }, { "irq_sp", &nil, db_access_irq_sp, }, @@ -99,8 +96,6 @@ struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); -int db_active = 0; - int db_access_und_sp(struct db_variable *vp, db_expr_t *valp, int rw) { @@ -128,39 +123,6 @@ return(0); } -#ifdef DDB -/* - * kdb_trap - field a TRACE or BPT trap - */ -int -kdb_trap(int type, db_regs_t *regs) -{ - int s; - - switch (type) { - case T_BREAKPOINT: /* breakpoint */ - case -1: /* keyboard interrupt */ - break; - default: - break; - } - - /* Should switch to kdb`s own stack here. */ - - ddb_regs = *regs; - - s = splhigh(); - db_active++; - db_trap(type, 0/*code*/); - db_active--; - splx(s); - - *regs = ddb_regs; - - return (1); -} -#endif - void db_show_mdpcpu(struct pcpu *pc) { @@ -188,7 +150,7 @@ /* * Read bytes from kernel address space for debugger. */ -void +int db_read_bytes(addr, size, data) vm_offset_t addr; size_t size; @@ -198,32 +160,33 @@ if (db_validate_address((u_int)src)) { db_printf("address %p is invalid\n", src); - return; + return (-1); } if (size == 4 && (addr & 3) == 0 && ((uintptr_t)data & 3) == 0) { *((int*)data) = *((int*)src); - return; + return (0); } if (size == 2 && (addr & 1) == 0 && ((uintptr_t)data & 1) == 0) { *((short*)data) = *((short*)src); - return; + return (0); } while (size-- > 0) { if (db_validate_address((u_int)src)) { db_printf("address %p is invalid\n", src); - return; + return (-1); } *data++ = *src++; } + return (0); } /* * Write bytes to kernel address space for debugger. */ -void +int db_write_bytes(vm_offset_t addr, size_t size, char *data) { char *dst; @@ -231,13 +194,13 @@ /* If any part is in kernel text, use db_write_text() */ if (addr >= (vm_offset_t) btext && addr < (vm_offset_t) etext) { - return; + return (-1); } dst = (char *)addr; if (db_validate_address((u_int)dst)) { db_printf("address %p is invalid\n", dst); - return; + return (0); } if (size == 4 && (addr & 3) == 0 && ((uintptr_t)data & 3) == 0) @@ -250,7 +213,7 @@ while (loop-- > 0) { if (db_validate_address((u_int)dst)) { db_printf("address %p is invalid\n", dst); - return; + return (-1); } *dst++ = *data++; } @@ -262,73 +225,8 @@ /* In case the current page tables have been modified ... */ cpu_tlb_flushID(); cpu_cpwait(); -} - -#ifdef DDB -void -Debugger(const char *msg) -{ - db_printf("Debugger(\"%s\")\n", msg); - __asm(".word 0xe7ffffff"); -} - -int -db_trapper(u_int addr, u_int inst, trapframe_t *frame, int fault_code) -{ - - if (fault_code == 0) { - if ((inst & ~INSN_COND_MASK) == (BKPT_INST & ~INSN_COND_MASK)) - kdb_trap(T_BREAKPOINT, frame); - else - kdb_trap(-1, frame); - } else - return (1); return (0); } -extern u_int end; - -#endif -u_int -db_fetch_reg(int reg, db_regs_t *db_regs) -{ - - switch (reg) { - case 0: - return (db_regs->tf_r0); - case 1: - return (db_regs->tf_r1); - case 2: - return (db_regs->tf_r2); - case 3: - return (db_regs->tf_r3); - case 4: - return (db_regs->tf_r4); - case 5: - return (db_regs->tf_r5); - case 6: - return (db_regs->tf_r6); - case 7: - return (db_regs->tf_r7); - case 8: - return (db_regs->tf_r8); - case 9: - return (db_regs->tf_r9); - case 10: - return (db_regs->tf_r10); - case 11: - return (db_regs->tf_r11); - case 12: - return (db_regs->tf_r12); - case 13: - return (db_regs->tf_svc_sp); - case 14: - return (db_regs->tf_svc_lr); - case 15: - return (db_regs->tf_pc); - default: - panic("db_fetch_reg: botch"); - } -} ==== //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#2 (text+ko) ==== @@ -30,12 +30,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.2 2004/07/12 21:25:01 cognet Exp $"); #include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 14 23:22:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B015216A4D0; Wed, 14 Jul 2004 23:22:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85BDD16A4CE for ; Wed, 14 Jul 2004 23:22:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CD0743D3F for ; Wed, 14 Jul 2004 23:22:54 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6ENMse8029010 for ; Wed, 14 Jul 2004 23:22:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6ENMsog029007 for perforce@freebsd.org; Wed, 14 Jul 2004 23:22:54 GMT (envelope-from peter@freebsd.org) Date: Wed, 14 Jul 2004 23:22:54 GMT Message-Id: <200407142322.i6ENMsog029007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2004 23:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=57366 Change 57366 by peter@peter_melody on 2004/07/14 23:22:27 IFC @57365 Affected files ... .. //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#5 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#6 integrate .. //depot/projects/hammer/lib/libpthread/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#15 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#15 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#30 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_priority_queue.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#26 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#21 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spec.c#4 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#3 integrate .. //depot/projects/hammer/share/dict/freebsd#3 integrate .. //depot/projects/hammer/share/man/man4/adw.4#2 integrate .. //depot/projects/hammer/share/man/man4/amr.4#7 integrate .. //depot/projects/hammer/share/man/man4/asr.4#6 integrate .. //depot/projects/hammer/share/man/man4/ed.4#3 integrate .. //depot/projects/hammer/share/man/man4/my.4#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#92 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#42 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#15 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#5 integrate .. //depot/projects/hammer/sys/net/if_sl.c#14 integrate .. //depot/projects/hammer/sys/net/if_var.h#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#6 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#31 integrate .. //depot/projects/hammer/sys/sys/event.h#4 integrate .. //depot/projects/hammer/sys/sys/eventvar.h#2 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#25 integrate .. //depot/projects/hammer/usr.bin/sed/compile.c#3 integrate .. //depot/projects/hammer/usr.bin/sed/defs.h#2 integrate .. //depot/projects/hammer/usr.bin/sed/main.c#4 integrate .. //depot/projects/hammer/usr.bin/sed/misc.c#4 integrate .. //depot/projects/hammer/usr.bin/sed/process.c#9 integrate .. //depot/projects/hammer/usr.bin/sed/sed.1#6 integrate .. //depot/projects/hammer/usr.bin/tr/cmap.c#2 integrate .. //depot/projects/hammer/usr.bin/tr/cset.c#2 integrate .. //depot/projects/hammer/usr.bin/tr/cset.h#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#7 integrate Differences ... ==== //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.3 2003/09/26 06:53:54 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.4 2004/07/13 22:54:22 davidxu Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -218,14 +218,27 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; + _tcb_set(kcb, tcb); - if (setmbox != 0) - _alpha_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _alpha_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - 0, NULL); + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox != 0) + _alpha_restore_context( + &tcb->tcb_tmbx.tm_context.uc_mcontext, + (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _alpha_restore_context( + &tcb->tcb_tmbx.tm_context.uc_mcontext, + 0, NULL); + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + /* We should not reach here. */ return (-1); } ==== //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.5 2003/10/23 06:12:57 peter Exp $ + * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.6 2004/07/13 22:54:22 davidxu Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -235,17 +235,31 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; + if ((kcb == NULL) || (tcb == NULL)) return (-1); kcb->kcb_curtcb = tcb; - if (setmbox != 0) - _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - 0, NULL); - /* We should not reach here. */ + + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox != 0) + _amd64_restore_context( + &tcb->tcb_tmbx.tm_context.uc_mcontext, + (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _amd64_restore_context( + &tcb->tcb_tmbx.tm_context.uc_mcontext, + 0, NULL); + /* We should not reach here. */ + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + return (-1); } #endif ==== //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.1 2004/05/14 12:21:29 cognet Exp $ + * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.3 2004/07/14 00:58:53 davidxu Exp $ */ /* @@ -227,15 +227,25 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; mcontext_t *mc; _tcb_set(kcb, tcb); mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; - if (setmbox) - _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _thr_setcontext(mc, 0, NULL); + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox) + _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _thr_setcontext(mc, 0, NULL); + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + /* We should not reach here. */ return (-1); } ==== //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.7 2003/09/19 23:28:13 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.8 2004/07/13 22:54:23 davidxu Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -237,15 +237,27 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; + if ((kcb == NULL) || (tcb == NULL)) return (-1); kcb->kcb_curtcb = tcb; - if (setmbox != 0) - _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, - (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, 0, NULL); + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox != 0) + _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, + (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, + 0, NULL); + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + /* We should not reach here. */ return (-1); } ==== //depot/projects/hammer/lib/libpthread/arch/sparc64/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/sparc64/include/pthread_md.h,v 1.1 2003/10/09 02:32:28 deischen Exp $ + * $FreeBSD: src/lib/libpthread/arch/sparc64/include/pthread_md.h,v 1.2 2004/07/13 22:54:23 davidxu Exp $ */ /* @@ -227,15 +227,25 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; mcontext_t *mc; _tcb_set(kcb, tcb); mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; - if (setmbox) - _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _thr_setcontext(mc, 0, NULL); + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox) + _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _thr_setcontext(mc, 0, NULL); + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + /* We should not reach here. */ return (-1); } ==== //depot/projects/hammer/lib/libpthread/pthread.map#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.10 2004/02/10 05:36:09 deischen Exp $ +# $FreeBSD: src/lib/libpthread/pthread.map,v 1.11 2004/07/13 22:52:53 davidxu Exp $ LIBTHREAD_1_0 { global: ___creat; @@ -329,14 +329,11 @@ writev; # Debugger needs these. + _libkse_debug; + _thread_activated; _thread_list; - _thread_next_offset; - _thread_uniqueid_offset; - _thread_state_offset; - _thread_name_offset; - _thread_ctx_offset; - _thread_PS_RUNNING_value; - _thread_PS_DEAD_value; + _thread_keytable; + _thread_active_threads; local: *; ==== //depot/projects/hammer/lib/libpthread/thread/thr_create.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.54 2004/06/12 07:40:01 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_create.c,v 1.55 2004/07/13 22:53:56 davidxu Exp $ */ #include #include @@ -44,20 +44,6 @@ #include "thr_private.h" #include "libc_private.h" -#define OFF(f) offsetof(struct pthread, f) -int _thread_next_offset = OFF(tle.tqe_next); -int _thread_uniqueid_offset = OFF(uniqueid); -int _thread_state_offset = OFF(state); -int _thread_name_offset = OFF(name); -void *_thread_tcb_offset = OFF(tcb); -#undef OFF -#define OFF(f) offsetof(struct tcb, f) -int _thread_ctx_offset = OFF(tcb_tmbx.tm_context); -#undef OFF - -int _thread_PS_RUNNING_value = PS_RUNNING; -int _thread_PS_DEAD_value = PS_DEAD; - static void free_thread(struct pthread *curthread, struct pthread *thread); static int create_stack(struct pthread_attr *pattr); static void free_stack(struct pthread_attr *pattr); ==== //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_exit.c,v 1.35 2003/09/14 22:52:16 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_exit.c,v 1.36 2004/07/13 22:49:58 davidxu Exp $ */ #include #include @@ -125,11 +125,11 @@ curkse = _get_curkse(); KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); /* Use thread_list_lock */ - _thr_active_threads--; + _thread_active_threads--; #ifdef SYSTEM_SCOPE_ONLY - if (_thr_active_threads == 0) { + if (_thread_active_threads == 0) { #else - if (_thr_active_threads == 1) { + if (_thread_active_threads == 1) { #endif KSE_LOCK_RELEASE(curkse, &_thread_list_lock); _kse_critical_leave(crit); ==== //depot/projects/hammer/lib/libpthread/thread/thr_init.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.62 2003/11/29 14:10:02 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_init.c,v 1.63 2004/07/13 22:51:03 davidxu Exp $ */ /* Allocate space for global thread variables here: */ @@ -310,6 +310,12 @@ _thr_signal_init(); _kse_critical_leave(&_thr_initial->tcb->tcb_tmbx); + /* + * activate threaded mode as soon as possible if we are + * being debugged + */ + if (_libkse_debug) + _kse_setthreaded(1); } /* ==== //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#30 (text+ko) ==== @@ -33,10 +33,11 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.106 2004/04/08 23:16:21 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.107 2004/07/13 22:49:58 davidxu Exp $"); #include #include +#include #include #include #include @@ -98,7 +99,10 @@ _pq_insert_tail(&(kse)->k_schedq->sq_runq, thrd) #define KSE_RUNQ_REMOVE(kse, thrd) \ _pq_remove(&(kse)->k_schedq->sq_runq, thrd) -#define KSE_RUNQ_FIRST(kse) _pq_first(&(kse)->k_schedq->sq_runq) +#define KSE_RUNQ_FIRST(kse) \ + ((_libkse_debug == 0) ? \ + _pq_first(&(kse)->k_schedq->sq_runq) : \ + _pq_first_debug(&(kse)->k_schedq->sq_runq)) #define KSE_RUNQ_THREADS(kse) ((kse)->k_schedq->sq_runq.pq_threads) @@ -222,7 +226,7 @@ * dump core. */ sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); - _thr_active_threads = 1; + _thread_active_threads = 1; /* * Enter a loop to remove and free all threads other than @@ -355,7 +359,7 @@ * dump core. */ sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); - _thr_active_threads = 1; + _thread_active_threads = 1; #endif } @@ -435,6 +439,9 @@ PANIC("kse_create() failed\n"); return (-1); } + _thr_initial->tcb->tcb_tmbx.tm_lwp = + _kse_initial->k_kcb->kcb_kmbx.km_lwp; + _thread_activated = 1; #ifndef SYSTEM_SCOPE_ONLY /* Set current thread to initial thread */ @@ -630,6 +637,19 @@ if (curthread->attr.flags & PTHREAD_SCOPE_SYSTEM) kse_sched_single(&curkse->k_kcb->kcb_kmbx); else { + if (__predict_false(_libkse_debug != 0)) { + /* + * Because debugger saves single step status in thread + * mailbox's tm_dflags, we can safely clear single + * step status here. the single step status will be + * restored by kse_switchin when the thread is + * switched in again. This also lets uts run in full + * speed. + */ + ptrace(PT_CLEARSTEP, curkse->k_kcb->kcb_kmbx.km_lwp, + (caddr_t) 1, 0); + } + KSE_SET_SWITCH(curkse); _thread_enter_uts(curthread->tcb, curkse->k_kcb); } @@ -697,7 +717,7 @@ curkse->k_flags |= KF_INITIALIZED; first = 1; curthread->active = 1; - + /* Setup kernel signal masks for new thread. */ __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); /* @@ -972,7 +992,7 @@ */ if (curthread == NULL) ; /* Nothing to do here. */ - else if ((curthread->need_switchout == 0) && + else if ((curthread->need_switchout == 0) && DBG_CAN_RUN(curthread) && (curthread->blocked == 0) && (THR_IN_CRITICAL(curthread))) { /* * Resume the thread and tell it to yield when @@ -992,8 +1012,10 @@ if (ret != 0) PANIC("Can't resume thread in critical region\n"); } - else if ((curthread->flags & THR_FLAGS_IN_RUNQ) == 0) + else if ((curthread->flags & THR_FLAGS_IN_RUNQ) == 0) { + curthread->tcb->tcb_tmbx.tm_lwp = 0; kse_switchout_thread(curkse, curthread); + } curkse->k_curthread = NULL; #ifdef DEBUG_THREAD_KERN @@ -2447,7 +2469,7 @@ */ thread->uniqueid = next_uniqueid++; THR_LIST_ADD(thread); - _thr_active_threads++; + _thread_active_threads++; KSE_LOCK_RELEASE(curkse, &_thread_list_lock); _kse_critical_leave(crit); } @@ -2465,7 +2487,7 @@ curkse = _get_curkse(); KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); THR_LIST_REMOVE(thread); - _thr_active_threads--; + _thread_active_threads--; KSE_LOCK_RELEASE(curkse, &_thread_list_lock); _kse_critical_leave(crit); } @@ -2499,3 +2521,27 @@ return (NULL); } +void +_thr_debug_check_yield(struct pthread *curthread) +{ + /* + * Note that TMDF_DONOTRUNUSER is set after process is suspended. + * When we are being debugged, every suspension in process + * will cause all KSEs to schedule an upcall in kernel, unless the + * KSE is in critical region. + * If the function is being called, it means the KSE is no longer + * in critical region, if the TMDF_DONOTRUNUSER is set by debugger + * before KSE leaves critical region, we will catch it here, else + * if the flag is changed during testing, it also not a problem, + * because the change only occurs after a process suspension event + * occurs. A suspension event will always cause KSE to schedule an + * upcall, in the case, because we are not in critical region, + * upcall will be scheduled sucessfully, the flag will be checked + * again in kse_sched_multi, we won't back until the flag + * is cleared by debugger, the flag will be cleared in next + * suspension event. + */ + if ((curthread->attr.flags & PTHREAD_SCOPE_SYSTEM) == 0 && + !DBG_CAN_RUN(curthread)) + _thr_sched_switch(curthread); +} ==== //depot/projects/hammer/lib/libpthread/thread/thr_priority_queue.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_priority_queue.c,v 1.14 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_priority_queue.c,v 1.15 2004/07/13 22:49:58 davidxu Exp $ */ #include #include @@ -242,6 +242,57 @@ return (pthread); } +/* + * Select a thread which is allowed to run by debugger, we probably + * should merge the function into _pq_first if that function is only + * used by scheduler to select a thread. + */ +pthread_t +_pq_first_debug(pq_queue_t *pq) +{ + pq_list_t *pql, *pqlnext = NULL; + pthread_t pthread = NULL; + + /* + * Make some assertions when debugging is enabled: + */ + PQ_ASSERT_INACTIVE(pq, "_pq_first: pq_active"); + PQ_SET_ACTIVE(pq); + + for (pql = TAILQ_FIRST(&pq->pq_queue); + pql != NULL && pthread == NULL; pql = pqlnext) { + if ((pthread = TAILQ_FIRST(&pql->pl_head)) == NULL) { + /* + * The priority list is empty; remove the list + * from the queue. + */ + pqlnext = TAILQ_NEXT(pql, pl_link); + TAILQ_REMOVE(&pq->pq_queue, pql, pl_link); + + /* Mark the list as not being in the queue: */ + pql->pl_queued = 0; + } else { + /* + * note there may be a suspension event during this + * test, If TMDF_DONOTRUNUSER is set after we tested it, + * we will run the thread, this seems be a problem, + * fortunatly, when we are being debugged, all context + * switch will be done by kse_switchin, that is a + * syscall, kse_switchin will check the flag again, + * the thread will be returned via upcall, so next + * time, UTS won't run the thread. + */ + while (pthread != NULL && !DBG_CAN_RUN(pthread)) { + pthread = TAILQ_NEXT(pthread, pqe); + } + if (pthread == NULL) + pqlnext = TAILQ_NEXT(pql, pl_link); + } + } + + PQ_CLEAR_ACTIVE(pq); + return (pthread); +} static void pq_insert_prio_list(pq_queue_t *pq, int prio) ==== //depot/projects/hammer/lib/libpthread/thread/thr_private.h#26 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.114 2004/06/12 07:40:01 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.115 2004/07/13 22:49:58 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -430,6 +430,7 @@ int prio; int suspend; #define THR_STACK_USER 0x100 /* 0xFF reserved for */ +#define THR_SIGNAL_THREAD 0x200 /* This is a signal thread */ int flags; void *arg_attr; void (*cleanup_attr) (); @@ -582,15 +583,19 @@ int seqno; }; +struct pthread_key { + volatile int allocated; + volatile int count; + int seqno; + void (*destructor) (void *); +}; #define MAX_THR_LOCKLEVEL 5 /* * Thread structure. */ struct pthread { - /* - * Thread mailbox is first so it cal be aligned properly. - */ + /* Thread control block */ struct tcb *tcb; /* @@ -816,12 +821,14 @@ #define THR_YIELD_CHECK(thrd) \ do { \ - if (((thrd)->critical_yield != 0) && \ - !(THR_IN_CRITICAL(thrd))) \ - _thr_sched_switch(thrd); \ - else if (((thrd)->check_pending != 0) && \ - !(THR_IN_CRITICAL(thrd))) \ - _thr_sig_check_pending(thrd); \ + if (!THR_IN_CRITICAL(thrd)) { \ + if (__predict_false(_libkse_debug)) \ + _thr_debug_check_yield(thrd); \ + if ((thrd)->critical_yield != 0) \ + _thr_sched_switch(thrd); \ + if ((thrd)->check_pending != 0) \ + _thr_sig_check_pending(thrd); \ + } \ } while (0) #define THR_LOCK_ACQUIRE(thrd, lck) \ @@ -882,8 +889,6 @@ _pq_insert_tail(&(thrd)->kseg->kg_schedq.sq_runq, thrd) #define THR_RUNQ_REMOVE(thrd) \ _pq_remove(&(thrd)->kseg->kg_schedq.sq_runq, thrd) -#define THR_RUNQ_FIRST(thrd) \ - _pq_first(&(thrd)->kseg->kg_schedq.sq_runq) /* * Macros to insert/remove threads to the all thread list and @@ -964,6 +969,8 @@ (((thrd)->state == PS_SUSPENDED) || \ (((thrd)->flags & THR_FLAGS_SUSPENDED) != 0)) #define THR_IS_EXITING(thrd) (((thrd)->flags & THR_FLAGS_EXITING) != 0) +#define DBG_CAN_RUN(thrd) (((thrd)->tcb->tcb_tmbx.tm_dflags & \ + TMDF_DONOTRUNUSER) == 0) extern int __isthreaded; @@ -980,6 +987,9 @@ SCLASS void *_usrstack SCLASS_PRESET(NULL); SCLASS struct kse *_kse_initial SCLASS_PRESET(NULL); SCLASS struct pthread *_thr_initial SCLASS_PRESET(NULL); +/* For debugger */ +SCLASS int _libkse_debug SCLASS_PRESET(0); +SCLASS int _thread_activated SCLASS_PRESET(0); /* List of all threads: */ SCLASS TAILQ_HEAD(, pthread) _thread_list @@ -989,7 +999,7 @@ SCLASS TAILQ_HEAD(, pthread) _thread_gc_list SCLASS_PRESET(TAILQ_HEAD_INITIALIZER(_thread_gc_list)); -SCLASS int _thr_active_threads SCLASS_PRESET(1); +SCLASS int _thread_active_threads SCLASS_PRESET(1); SCLASS TAILQ_HEAD(atfork_head, pthread_atfork) _thr_atfork_list; SCLASS pthread_mutex_t _thr_atfork_mutex; @@ -1079,6 +1089,7 @@ void _pq_insert_head(struct pq_queue *pq, struct pthread *); void _pq_insert_tail(struct pq_queue *pq, struct pthread *); struct pthread *_pq_first(struct pq_queue *pq); +struct pthread *_pq_first_debug(struct pq_queue *pq); void *_pthread_getspecific(pthread_key_t); int _pthread_key_create(pthread_key_t *, void (*) (void *)); int _pthread_key_delete(pthread_key_t); @@ -1150,6 +1161,7 @@ struct pthread *_thr_hash_find(struct pthread *); void _thr_finish_cancellation(void *arg); int _thr_sigonstack(void *sp); +void _thr_debug_check_yield(struct pthread *); /* * Aliases for _pthread functions. Should be called instead of ==== //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#21 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.78 2004/06/12 07:40:01 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.79 2004/07/13 22:52:11 davidxu Exp $ */ #include #include @@ -232,6 +232,7 @@ pthread_sigmask(SIG_SETMASK, &sigset, &oldset); pthread_attr_init(&attr); pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); + attr->flags |= THR_SIGNAL_THREAD; /* sigmask will be inherited */ if (pthread_create(&_thr_sig_daemon, &attr, sig_daemon, NULL)) PANIC("can not create signal daemon thread!\n"); @@ -347,6 +348,11 @@ err_save = errno; timeout_save = curthread->timeout; intr_save = curthread->interrupted; + /* Check if the signal requires a dump of thread information: */ + if (sig == SIGINFO) { + /* Dump thread information to file: */ + _thread_dump_info(); + } _kse_critical_enter(); /* Get a fresh copy of signal mask */ __sys_sigprocmask(SIG_BLOCK, NULL, &curthread->sigmask); @@ -505,6 +511,12 @@ { _kse_critical_leave(&curthread->tcb->tcb_tmbx); + /* Check if the signal requires a dump of thread information: */ + if (shi->sig == SIGINFO) { + /* Dump thread information to file: */ + _thread_dump_info(); + } + if (((__sighandler_t *)shi->sigfunc != SIG_DFL) && ((__sighandler_t *)shi->sigfunc != SIG_IGN)) { if ((shi->sa_flags & SA_SIGINFO) != 0 || shi->info == NULL) @@ -695,12 +707,18 @@ kse_wakeup(kmbx); return (NULL); } else if (!SIGISMEMBER(pthread->sigmask, sig)) { - sigfunc = _thread_sigact[sig - 1].sa_sigaction; - if ((__sighandler_t *)sigfunc == SIG_DFL) { - if (sigprop(sig) & SA_KILL) { - kse_thr_interrupt(NULL, - KSE_INTR_SIGEXIT, sig); - /* Never reach */ + /* + * If debugger is running, we don't quick exit, + * and give it a chance to check the signal. + */ + if (_libkse_debug == 0) { + sigfunc = _thread_sigact[sig - 1].sa_sigaction; + if ((__sighandler_t *)sigfunc == SIG_DFL) { + if (sigprop(sig) & SA_KILL) { + kse_thr_interrupt(NULL, + KSE_INTR_SIGEXIT, sig); + /* Never reach */ + } } } if (pthread->state == PS_SIGSUSPEND) { @@ -1198,13 +1216,8 @@ __sys_sigprocmask(SIG_SETMASK, &sigset, &_thr_initial->sigmask); /* Enter a loop to get the existing signal status: */ for (i = 1; i <= _SIG_MAXSIG; i++) { - /* Check for signals which cannot be trapped: */ - if (i == SIGKILL || i == SIGSTOP) { - } - /* Get the signal handler details: */ - else if (__sys_sigaction(i, NULL, - &_thread_sigact[i - 1]) != 0) { + if (__sys_sigaction(i, NULL, &_thread_sigact[i - 1]) != 0) { /* * Abort this process if signal * initialisation fails: ==== //depot/projects/hammer/lib/libpthread/thread/thr_spec.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_spec.c,v 1.21 2003/08/20 02:34:14 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_spec.c,v 1.22 2004/07/13 22:49:58 davidxu Exp $ */ #include #include @@ -38,15 +38,8 @@ #include #include "thr_private.h" -struct pthread_key { - volatile int allocated; - volatile int count; - int seqno; - void (*destructor) (); -}; - /* Static variables: */ -static struct pthread_key key_table[PTHREAD_KEYS_MAX]; +struct pthread_key _thread_keytable[PTHREAD_KEYS_MAX]; __weak_reference(_pthread_key_create, pthread_key_create); __weak_reference(_pthread_key_delete, pthread_key_delete); @@ -64,10 +57,10 @@ THR_LOCK_ACQUIRE(curthread, &_keytable_lock); for (i = 0; i < PTHREAD_KEYS_MAX; i++) { - if (key_table[i].allocated == 0) { - key_table[i].allocated = 1; - key_table[i].destructor = destructor; - key_table[i].seqno++; + if (_thread_keytable[i].allocated == 0) { + _thread_keytable[i].allocated = 1; + _thread_keytable[i].destructor = destructor; + _thread_keytable[i].seqno++; /* Unlock the key table: */ THR_LOCK_RELEASE(curthread, &_keytable_lock); @@ -91,8 +84,8 @@ /* Lock the key table: */ THR_LOCK_ACQUIRE(curthread, &_keytable_lock); - if (key_table[key].allocated) - key_table[key].allocated = 0; + if (_thread_keytable[key].allocated) + _thread_keytable[key].allocated = 0; else ret = EINVAL; @@ -123,13 +116,13 @@ (curthread->specific_data_count > 0); key++) { destructor = NULL; - if (key_table[key].allocated && + if (_thread_keytable[key].allocated && (curthread->specific[key].data != NULL)) { if (curthread->specific[key].seqno == - key_table[key].seqno) { + _thread_keytable[key].seqno) { data = (void *) curthread->specific[key].data; - destructor = key_table[key].destructor; + destructor = _thread_keytable[key].destructor; } curthread->specific[key].data = NULL; curthread->specific_data_count--; @@ -185,7 +178,7 @@ if ((pthread->specific) || (pthread->specific = pthread_key_allocate_data())) { if ((unsigned int)key < PTHREAD_KEYS_MAX) { - if (key_table[key].allocated) { + if (_thread_keytable[key].allocated) { if (pthread->specific[key].data == NULL) { if (value != NULL) pthread->specific_data_count++; @@ -193,7 +186,7 @@ pthread->specific_data_count--; pthread->specific[key].data = value; pthread->specific[key].seqno = - key_table[key].seqno; + _thread_keytable[key].seqno; ret = 0; } else ret = EINVAL; @@ -216,8 +209,8 @@ /* Check if there is specific data: */ if (pthread->specific != NULL && (unsigned int)key < PTHREAD_KEYS_MAX) { /* Check if this key has been used before: */ - if (key_table[key].allocated && - (pthread->specific[key].seqno == key_table[key].seqno)) { + if (_thread_keytable[key].allocated && + (pthread->specific[key].seqno == _thread_keytable[key].seqno)) { /* Return the value: */ data = (void *) pthread->specific[key].data; } else { ==== //depot/projects/hammer/sbin/geom/core/geom.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.2 2004/07/07 21:00:57 ru Exp $ +.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.3 2004/07/14 13:32:00 pjd Exp $ .\" .Dd May 21, 2004 .Dt GEOM 8 @@ -111,6 +111,7 @@ .Sh SEE ALSO .Xr geom 4 , .Xr gconcat 8 , +.Xr glabel 8 , .Xr gnop 8 , .Xr gstripe 8 .Sh HISTORY ==== //depot/projects/hammer/share/dict/freebsd#3 (text+ko) ==== @@ -1,15 +1,30 @@ -$FreeBSD: src/share/dict/freebsd,v 1.6 2003/04/20 21:36:12 murray Exp $ +$FreeBSD: src/share/dict/freebsd,v 1.9 2004/07/14 07:10:15 murray Exp $ ABI +ACL ACPI +ADSL +AGP AMD +API +APIC +ATAPI +ATX +AVI AXP +AfterStep AlphaBIOS Appletalk +Athlon +BIBA BOFs +BOOTP BSDCon BSDi Barnes +BeOS +Bluetooth Border's +Broadcom CDROM CDROMs CDs @@ -25,11 +40,19 @@ DEVBUF DNS DTD +DVD +DVI >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 15 12:11:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0394016A4D0; Thu, 15 Jul 2004 12:11:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D133716A4CE for ; Thu, 15 Jul 2004 12:11:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C98F243D45 for ; Thu, 15 Jul 2004 12:11:32 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6FCBWt0053724 for ; Thu, 15 Jul 2004 12:11:32 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6FCBWCr053721 for perforce@freebsd.org; Thu, 15 Jul 2004 12:11:32 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 15 Jul 2004 12:11:32 GMT Message-Id: <200407151211.i6FCBWCr053721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 57395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2004 12:11:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=57395 Change 57395 by davidxu@davidxu_alona on 2004/07/15 12:11:14 IFC @57389 Affected files ... .. //depot/projects/davidxu_ksedbg/src/include/Makefile#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/include/thread_db.h#1 branch .. //depot/projects/davidxu_ksedbg/src/release/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/alpha/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/amd64/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/i386/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/ia64/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/sparc64/mkisoimages.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/geom/core/geom.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/adw.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/amr.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/asr.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ed.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/my.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/dcons/dcons.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_pccard.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/harp/if_harp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/hfa/hfa_freebsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/md/md.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/null/null.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/random/randomdev.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/vinum/vinum.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i4b/include/i4b_global.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_init.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_disc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_ef.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_faith.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_gif.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_gre.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_loop.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_sl.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_stf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_tun.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_var.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/exec.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/procfs.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/basename/basename.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/checknr/checknr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/col/col.1#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/colcrt/colcrt.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/colcrt/colcrt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/column/column.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/column/column.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/du/du.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/fmt/fmt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/killall/killall.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/pkill/pkill.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/sed/sed.1#5 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/read.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/whereis/whereis.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/xstr/xstr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/usbd/usbd.conf.5#2 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.216 2004/07/05 23:13:16 das Exp $ +# $FreeBSD: src/include/Makefile,v 1.217 2004/07/15 03:43:18 davidxu Exp $ # # Doing a "make install" builds /usr/include. ==== //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.30 2004/07/10 18:10:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.31 2004/07/15 03:13:27 kientzle Exp $"); #include #include @@ -72,7 +72,7 @@ struct extract { mode_t umask; mode_t default_dir_mode; - struct archive_string mkdirpath; + struct archive_string create_parent_dir; struct fixup_entry *fixup_list; struct fixup_entry *current_fixup; @@ -110,9 +110,11 @@ static int extract_symlink(struct archive *, struct archive_entry *, int); static gid_t lookup_gid(struct archive *, const char *uname, gid_t); static uid_t lookup_uid(struct archive *, const char *uname, uid_t); -static int mkdirpath(struct archive *, const char *, int flags); -static int mkdirpath_internal(struct archive *, char *, int flags); -static int mkdirpath_recursive(struct archive *, char *, int flags); +static int create_parent_dir(struct archive *, const char *, int flags); +static int create_parent_dir_internal(struct archive *, char *, + int flags); +static int create_parent_dir_recursive(struct archive *, char *, + int flags); static int restore_metadata(struct archive *, struct archive_entry *, int flags); #ifdef HAVE_POSIX_ACL @@ -275,7 +277,7 @@ p = next; } extract->fixup_list = NULL; - archive_string_free(&extract->mkdirpath); + archive_string_free(&extract->create_parent_dir); free(a->extract); a->extract = NULL; } @@ -409,7 +411,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (fd < 0) { - mkdirpath(a, name, flags); + create_parent_dir(a, name, flags); fd = open(name, O_WRONLY | O_CREAT | O_EXCL, mode); } if (fd < 0) { @@ -434,8 +436,9 @@ extract->pst = NULL; /* Invalidate cached stat data. */ /* Copy path to mutable storage. */ - archive_strcpy(&(extract->mkdirpath), archive_entry_pathname(entry)); - path = extract->mkdirpath.s; + archive_strcpy(&(extract->create_parent_dir), + archive_entry_pathname(entry)); + path = extract->create_parent_dir.s; /* Deal with any troublesome trailing path elements. */ for (;;) { @@ -477,7 +480,7 @@ unlink(path); } else { /* Doesn't already exist; try building the parent path. */ - if (mkdirpath_internal(a, path, flags) != ARCHIVE_OK) + if (create_parent_dir_internal(a, path, flags) != ARCHIVE_OK) return (ARCHIVE_WARN); } @@ -512,24 +515,26 @@ * path into mutable storage first. */ static int -mkdirpath(struct archive *a, const char *path, int flags) +create_parent_dir(struct archive *a, const char *path, int flags) { struct extract *extract; + int r; extract = a->extract; /* Copy path to mutable storage. */ - archive_strcpy(&(extract->mkdirpath), path); + archive_strcpy(&(extract->create_parent_dir), path); - return (mkdirpath_internal(a, extract->mkdirpath.s, flags)); + r = create_parent_dir_internal(a, extract->create_parent_dir.s, flags); + return (r); } /* - * Handle remaining setup for mkdirpath_recursive(), assuming + * Handle remaining setup for create_parent_dir_recursive(), assuming * path is already in mutable storage. */ static int -mkdirpath_internal(struct archive *a, char *path, int flags) +create_parent_dir_internal(struct archive *a, char *path, int flags) { char *slash; mode_t old_umask; @@ -541,7 +546,7 @@ return (ARCHIVE_OK); *slash = '\0'; old_umask = umask(~SECURE_DIR_MODE); - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); umask(old_umask); *slash = '/'; return (r); @@ -554,7 +559,7 @@ * Otherwise, returns ARCHIVE_WARN. */ static int -mkdirpath_recursive(struct archive *a, char *path, int flags) +create_parent_dir_recursive(struct archive *a, char *path, int flags) { struct stat st; struct extract *extract; @@ -579,7 +584,7 @@ /* Don't bother trying to create null path, '.', or '..'. */ if (slash != NULL) { *slash = '\0'; - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); *slash = '/'; return (r); } @@ -611,7 +616,7 @@ return (ARCHIVE_WARN); } else if (slash != NULL) { *slash = '\0'; - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); *slash = '/'; if (r != ARCHIVE_OK) return (r); @@ -658,7 +663,7 @@ if (r != 0) { /* Might be a non-existent parent dir; try fixing that. */ - mkdirpath(a, pathname, flags); + create_parent_dir(a, pathname, flags); r = link(linkname, pathname); } @@ -695,7 +700,7 @@ if (r != 0) { /* Might be a non-existent parent dir; try fixing that. */ - mkdirpath(a, pathname, flags); + create_parent_dir(a, pathname, flags); r = symlink(linkname, pathname); } @@ -728,7 +733,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (r != 0 && errno == ENOENT) { - mkdirpath(a, archive_entry_pathname(entry), flags); + create_parent_dir(a, archive_entry_pathname(entry), flags); r = mknod(archive_entry_pathname(entry), mode, archive_entry_rdev(entry)); } @@ -777,7 +782,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (r != 0 && errno == ENOENT) { - mkdirpath(a, archive_entry_pathname(entry), flags); + create_parent_dir(a, archive_entry_pathname(entry), flags); r = mkfifo(archive_entry_pathname(entry), archive_entry_mode(entry)); } ==== //depot/projects/davidxu_ksedbg/src/release/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.845 2004/06/10 19:33:26 brian Exp $ +# $FreeBSD: src/release/Makefile,v 1.846 2004/07/15 04:52:57 jhb Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -314,6 +314,18 @@ @echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!" @exit 1 .endif +.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) +.for p in ${LOCAL_PATCHES} +.if !exists(${p}) + @echo "The patch file ${p} does not exist!" + @exit 1 +.endif +.endfor +.endif +.if defined(LOCAL_SCRIPT) && !exists(${LOCAL_SCRIPT}) + @echo "The local script ${LOCAL_SCRIPT} does not exist!" + @exit 1 +.endif .if make(release) .if exists(${CHROOTDIR}) # The first command will fail on a handful of files that have their schg @@ -347,12 +359,10 @@ .endif .if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) .for p in ${LOCAL_PATCHES} -.if exists(${p}) patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p} -.endif .endfor .endif -.if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) +.if defined(LOCAL_SCRIPT) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} \ RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} .endif ==== //depot/projects/davidxu_ksedbg/src/release/alpha/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.10 2004/07/15 09:28:02 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" + if [ "x$1" = "x-b" ]; then bootable="yes" shift @@ -50,7 +52,7 @@ LABEL=$1; shift NAME=$1; shift -mkisofs -r -J -V $LABEL -o $NAME $* +mkisofs -r -J -V $LABEL -P "$publisher" -o $NAME $* type setcdboot 2>&1 | grep " is " >/dev/null if [ $? -ne 0 ]; then ==== //depot/projects/davidxu_ksedbg/src/release/amd64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.10 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" if [ "x$1" = "x-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-b boot/cdboot -no-emul-boot" @@ -53,4 +54,4 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* ==== //depot/projects/davidxu_ksedbg/src/release/i386/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.10 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" + if [ "x$1" = "x-b" ]; then bootable="-b boot/cdboot -no-emul-boot" shift @@ -55,4 +57,4 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* ==== //depot/projects/davidxu_ksedbg/src/release/ia64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.7 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.8 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" set -e # The hackery function is to help with the development of the release @@ -91,6 +92,6 @@ BOOTOPTS="-b $EFIPART -no-emul-boot" fi -mkisofs $BOOTOPTS -r -J -V $LABEL -o $NAME $BASE $* +mkisofs $BOOTOPTS -r -J -V $LABEL -P "$publisher" -o $NAME $BASE $* rm -f $BASE/$EFIPART exit 0 ==== //depot/projects/davidxu_ksedbg/src/release/sparc64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.5 2004/07/12 07:59:25 kris Exp $ +# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.6 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" IMG=/tmp/bootfs MNT=/mnt @@ -65,5 +66,5 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* rm -f ${IMG} ==== //depot/projects/davidxu_ksedbg/src/sbin/geom/core/geom.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.2 2004/07/07 21:00:57 ru Exp $ +.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.3 2004/07/14 13:32:00 pjd Exp $ .\" .Dd May 21, 2004 .Dt GEOM 8 @@ -111,6 +111,7 @@ .Sh SEE ALSO .Xr geom 4 , .Xr gconcat 8 , +.Xr glabel 8 , .Xr gnop 8 , .Xr gstripe 8 .Sh HISTORY ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/adw.4#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/adw.4,v 1.16 2001/10/13 09:08:30 yokota Exp $ +.\" $FreeBSD: src/share/man/man4/adw.4,v 1.17 2004/07/14 21:58:17 simon Exp $ .\" -.Dd February 13, 2000 +.Dd July 14, 2004 .Dt ADW 4 .Os .Sh NAME @@ -43,13 +43,6 @@ and .Tn ASC38C0800 Ultra2 , SCSI Host Adapter chips. -AdvanSys products incorporating these chips include the -.Tn ABP[3]940UW , -.Tn ABP950UW , -.Tn ABP970UW , -.Tn ABP3940U2W , -and -.Tn ABP3950U2W . Both chips support, synchronous transfers (20MHz and 40MHz max respectively), 16bit transfers, tagged queueing, @@ -66,6 +59,23 @@ per target is not honored as the CAM SCSI system will automatically determine the maximum number of tags a device can receive as well as guarantee fair resource allocation among devices. +.Sh HARDWARE +The +.Nm +driver supports SCSI controllers including: +.Pp +.Bl -bullet -compact +.It +AdvanSys ABP940UW/ABP3940UW +.It +AdvanSys ABP950UW +.It +AdvanSys ABP970UW +.It +AdvanSys ABP3940U2W +.It +AdvanSys ABP3950U2W +.El .Sh SEE ALSO .Xr adv 4 , .Xr cd 4 , ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/amr.4#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/amr.4,v 1.20 2003/12/23 16:22:34 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/amr.4,v 1.21 2004/07/14 21:58:17 simon Exp $ .\" -.Dd January 23, 2000 +.Dd July 14, 2004 .Dt AMR 4 .Os .Sh NAME @@ -38,41 +38,44 @@ driver provides support for American Megatrends MegaRAID Express, Elite and Enterprise family SCSI RAID controllers, including models relabeled and sold by Hewlett-Packard and Dell. -Supported controllers include: +.Sh HARDWARE +The +.Nm +driver supports the following: .Pp .Bl -bullet -compact .It -MegaRAID 320-1 +AMI MegaRAID 320-1 .It -MegaRAID 320-2 +AMI MegaRAID 320-2 .It -MegaRAID 320-4X +AMI MegaRAID 320-4X .It -MegaRAID Series 418 +AMI MegaRAID Series 418 .It -MegaRAID Enterprise 1200 (Series 428) +AMI MegaRAID Enterprise 1200 (Series 428) .It -MegaRAID Enterprise 1300 (Series 434) +AMI MegaRAID Enterprise 1300 (Series 434) .It -MegaRAID Enterprise 1400 (Series 438) +AMI MegaRAID Enterprise 1400 (Series 438) .It -MegaRAID Enterprise 1500 (Series 467) +AMI MegaRAID Enterprise 1500 (Series 467) .It -MegaRAID Enterprise 1600 (Series 471) +AMI MegaRAID Enterprise 1600 (Series 471) .It -MegaRAID Elite 1500 (Series 467) +AMI MegaRAID Elite 1500 (Series 467) .It -MegaRAID Elite 1600 (Series 493) +AMI MegaRAID Elite 1600 (Series 493) .It -MegaRAID Elite 1650 (Series 4xx) +AMI MegaRAID Elite 1650 (Series 4xx) .It -MegaRAID Express 100 (Series 466WS) +AMI MegaRAID Express 100 (Series 466WS) .It -MegaRAID Express 200 (Series 466) +AMI MegaRAID Express 200 (Series 466) .It -MegaRAID Express 300 (Series 490) +AMI MegaRAID Express 300 (Series 490) .It -MegaRAID Express 500 (Series 475) +AMI MegaRAID Express 500 (Series 475) .It Dell PERC .It ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/asr.4#2 (text+ko) ==== @@ -4,9 +4,9 @@ .\" .\" Manpage cleanup by: Jeroen Ruigrok van der Werven .\" -.\" $FreeBSD: src/share/man/man4/asr.4,v 1.22 2004/05/02 17:17:19 schweikh Exp $ +.\" $FreeBSD: src/share/man/man4/asr.4,v 1.23 2004/07/14 21:58:17 simon Exp $ .\" -.Dd October 27, 2000 +.Dd July 14, 2004 .Dt ASR 4 .Os .Sh NAME @@ -22,9 +22,30 @@ SmartRAID SCSI RAID adapters through the standard SCSI disk .Xr da 4 interface. -The adapters currently supported include the following RAID adapters: +.Pp +The supported adapters provide 64 bit PCI, +Compact PCI, Zero Channel PCI, +and up to four channels of Ultra2, Ultra 160, or Ultra320 SCSI, +or two channels of 1GB Fibre. +All support RAID-0, RAID-1, RAID-10, RAID-5 and RAID-50 arrays. +All SCSI target types are supported. +For the ATA based controllers, one IDE drive per channel is supported. +Hot-swapping of IDE drives is not supported at this time. +.Pp +All host bus adapters must be configured +before they can be used with any operating system. +Please contact Adaptec directly to obtain the latest information +on configuration utilities for the adapters. +Currently there are both a Motif based GUI configuration utility +and a CLI based configuration utility available from the Adaptec Web site. +The cards and arrays can also be configured via the BIOS based configuration +tool (SMOR). +.Sh HARDWARE +The adapters currently supported by the +.Nm +driver include the following: .Pp -.Bl -item -compact +.Bl -bullet -compact .It Adaptec Zero-Channel SCSI RAID 2000S, 2005S, 2010S, 2015S .It @@ -59,24 +80,6 @@ DEC KZPCC-XC (LVD 1-ch, 16MB cache), DEC KZPCC-XE (LVD 3-ch, 64MB cache) -- rebadged SmartRAID V Millennium .El -.Pp -These adapters provide 64 bit PCI, -Compact PCI, Zero Channel PCI, -and up to four channels of Ultra2, Ultra 160, or Ultra320 SCSI, -or two channels of 1GB Fibre. -All support RAID-0, RAID-1, RAID-10, RAID-5 and RAID-50 arrays. -All SCSI target types are supported. -For the ATA based controllers, one IDE drive per channel is supported. -Hot-swapping of IDE drives is not supported at this time. -.Pp -All host bus adapters must be configured -before they can be used with any operating system. -Please contact Adaptec directly to obtain the latest information -on configuration utilities for the adapters. -Currently there are both a Motif based GUI configuration utility -and a CLI based configuration utility available from the Adaptec Web site. -The cards and arrays can also be configured via the BIOS based configuration -tool (SMOR). .Sh FILES .Bl -tag -width "/dev/asr*" -compact .It Pa /dev/asr* ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/ed.4#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ed.4,v 1.35 2003/02/15 17:12:53 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/ed.4,v 1.36 2004/07/14 21:58:17 simon Exp $ .\" -.Dd October 7, 2001 +.Dd July 14, 2004 .Dt ED 4 .Os .Sh NAME @@ -45,12 +45,6 @@ driver provides support for 8 and 16bit ethernet cards that are based on the National Semiconductor DS8390 and similar NICs manufactured by other companies. .Pp -It supports all 80x3 series ethernet cards manufactured by Western Digital and SMC, -the SMC Ultra, the 3Com 3c503, the Novell NE1000/NE2000 and compatible cards, -the HP PC Lan+, the RealTek 8029, -and the Digital Equipment EtherWorks DE305 card. -ISA, PCI and PC Card devices are supported. -.Pp The .Nm driver uses a unique multi-buffering mechanism to achieve high transmit performance. @@ -104,6 +98,29 @@ option to .Xr ifconfig 8 (BNC is the default). +.Sh HARDWARE +The +.Nm +driver supports the following Ethernet NICs: +.Pp +.Bl -bullet -compact +.It +3Com 3c503 +.It +Digital Equipment EtherWorks DE305 +.It +HP PC Lan+ +.It +Novell NE1000/NE2000 and compatible +.It +RealTek 8029 +.It +SMC Ultra +.It +Western Digital and SMC 80x3 series +.El +.Pp +ISA, PCI and PC Card devices are supported. .Sh DIAGNOSTICS .Bl -diag .It "ed%d: kernel configured irq %d doesn't match board configured irq %d." ==== //depot/projects/davidxu_ksedbg/src/share/man/man4/my.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/my.4,v 1.3 2003/08/31 19:37:48 simon Exp $ +.\" $FreeBSD: src/share/man/man4/my.4,v 1.4 2004/07/14 21:58:17 simon Exp $ .\" -.Dd May 16, 2003 +.Dd July 14, 2004 .Dt MY 4 .Os .Sh NAME @@ -38,6 +38,13 @@ .Nm driver provides support for various NICs based on the Myson chipset. The Myson chipset is a variant of the DEC Tulip NIC chipset. +.Pp +The driver will work with almost any MII-compliant PHY, thus failure to +positively identify the chip is not a fatal error. +.Sh HARDWARE +The +.Nm +driver provides support for various NICs based on the Myson chipset. Supported models include: .Pp .Bl -bullet -compact @@ -48,9 +55,6 @@ .It Myson MTD89X PCI Gigabit Ethernet chip .El -.Pp -The driver will work with almost any MII-compliant PHY, thus failure to -positively identify the chip is not a fatal error. .Sh SEE ALSO .Xr de 4 , .Xr miibus 4 , ==== //depot/projects/davidxu_ksedbg/src/sys/alpha/linux/linux_sysvec.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.92 2003/12/23 02:42:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.93 2004/07/15 08:25:59 phk Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -274,6 +274,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: + return (EOPNOTSUPP); break; } return error; ==== //depot/projects/davidxu_ksedbg/src/sys/cam/cam_periph.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.13 2003/03/08 08:01:26 phk Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.14 2004/07/15 08:25:59 phk Exp $ */ #ifndef _CAM_CAM_PERIPH_H @@ -53,6 +53,8 @@ case MOD_UNLOAD: \ printf(#name " module unload - not possible for this module type\n"); \ return EINVAL; \ + default: \ + return EOPNOTSUPP; \ } \ return 0; \ } \ ==== //depot/projects/davidxu_ksedbg/src/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.141 2004/06/21 19:01:55 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.142 2004/07/15 08:25:59 phk Exp $"); #include #include @@ -1348,6 +1348,8 @@ xpt_init(NULL); } else if (what == MOD_UNLOAD) { return EBUSY; + } else { + return EOPNOTSUPP; } return 0; ==== //depot/projects/davidxu_ksedbg/src/sys/coda/coda_fbsd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.35 2004/06/17 17:16:40 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.36 2004/07/15 08:25:59 phk Exp $"); #include "vcoda.h" @@ -90,9 +90,9 @@ case MOD_LOAD: break; case MOD_UNLOAD: - break; + return (EBUSY); default: - break; + return (EOPNOTSUPP); } return 0; } ==== //depot/projects/davidxu_ksedbg/src/sys/compat/svr4/svr4_sysvec.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.36 2003/12/23 02:42:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.37 2004/07/15 08:26:00 phk Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -411,6 +411,7 @@ printf("svr4 ELF exec handler removed\n"); break; default: + return (EOPNOTSUPP); break; } return error; ==== //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1244 2004/07/11 01:44:07 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1245 2004/07/15 07:52:27 roam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1932,7 +1932,7 @@ # # The 'bktr' device is a PCI video capture device using the Brooktree # bt848/bt848a/bt849a/bt878/bt879 chipset. When used with a TV Tuner it forms a -# TV card, eg Miro PC/TV, Hauppauge WinCast/TV WinTV, VideoLogic Captivator, +# TV card, e.g. Miro PC/TV, Hauppauge WinCast/TV WinTV, VideoLogic Captivator, # Intel Smart Video III, AverMedia, IMS Turbo, FlyVideo. # # options OVERRIDE_CARD=xxx @@ -1948,11 +1948,11 @@ # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC # Specifies the default video capture mode. # This is required for Dual Crystal (28&35Mhz) boards where PAL is used -# to prevent hangs during initialisation. eg VideoLogic Captivator PCI. +# to prevent hangs during initialisation, e.g. VideoLogic Captivator PCI. # # options BKTR_USE_PLL -# PAL or SECAM users who have a 28Mhz crystal (and no 35Mhz crystal) -# must enable PLL mode with this option. eg some new Bt878 cards. +# This is required for PAL or SECAM boards with a 28Mhz crystal and no 35Mhz +# crystal, e.g. some new Bt878 cards. # # options BKTR_GPIO_ACCESS # This enable IOCTLs which give user level access to the GPIO port. ==== //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.32 2004/07/12 20:53:04 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.33 2004/07/14 19:31:31 marks Exp $ */ #include "opt_acpi.h" @@ -519,6 +519,15 @@ valid_units++; bat[i]->cap = 100 * bat[i]->bst.cap / bat[i]->bif.lfcap; + + /* + * Some laptops report the "design-capacity" instead of the + * "real-capacity" when the battery is fully charged. + * That breaks the above arithmetic as it needs to be 100% maximum. + */ + if (bat[i]->cap > 100) + bat[i]->cap = 100; + batt_stat |= bat[i]->bst.state; if (bat[i]->bst.rate > 0) { ==== //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic79xx_osm.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.16 2003/12/17 00:02:09 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.17 2004/07/15 08:26:00 phk Exp $"); #include #include @@ -1540,6 +1540,7 @@ ahd_modevent(module_t mod, int type, void *data) { /* XXX Deal with busy status on unload. */ + /* XXX Deal with unknown events */ return 0; } ==== //depot/projects/davidxu_ksedbg/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 15 22:16:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A21FE16A4D0; Thu, 15 Jul 2004 22:16:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6418A16A4CE for ; Thu, 15 Jul 2004 22:16:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58B3D43D2F for ; Thu, 15 Jul 2004 22:16:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6FMGqjW072427 for ; Thu, 15 Jul 2004 22:16:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6FMGpZd072424 for perforce@freebsd.org; Thu, 15 Jul 2004 22:16:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Jul 2004 22:16:51 GMT Message-Id: <200407152216.i6FMGpZd072424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 57418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2004 22:16:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=57418 Change 57418 by rwatson@rwatson_tislabs on 2004/07/15 22:16:26 Integrate netperf_socket from rwatson_netperf: More VM lockisms. More ACPIisms. More tty reformulation. Return EOPNOTSUPP for unrecognized module events. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#12 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#6 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/netperf_socket/sys/cam/cam_periph.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#28 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#12 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#22 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#32 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_mem.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/fb/fb.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_acpi.c#1 branch .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdcvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/harp/if_harp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/hfa_freebsd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/null/null.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openpromio.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/driver.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/streams/streams.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/utopia/utopia.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/netperf_socket/sys/i386/i386/swtch.s#5 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_drv.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/netperf_socket/sys/i4b/include/i4b_global.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#12 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/ssc.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mac.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_module.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/tty_conf.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/tty_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_init.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/netperf_socket/sys/modules/fdc/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/modules/sound/sound/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/if_disc.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_ef.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_faith.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if_gif.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if_loop.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_ppp.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_sl.c#9 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/netperf_socket/sys/net/if_stf.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if_tun.c#10 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#10 integrate .. //depot/projects/netperf_socket/sys/net/ppp_tty.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_fw.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#11 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fdc_cbus.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#16 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#11 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/netperf_socket/sys/sys/exec.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/procfs.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#11 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#12 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#12 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.157 2004/07/14 05:49:44 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.158 2004/07/15 18:00:41 alc Exp $"); #include #include @@ -1573,6 +1573,8 @@ */ if (pmap->pm_stats.resident_count == 0) return; + + vm_page_lock_queues(); PMAP_LOCK(pmap); /* @@ -1600,6 +1602,7 @@ nva = va + PAGE_SIZE; } out: + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -1700,6 +1703,7 @@ if ((sva & PAGE_MASK) || (eva & PAGE_MASK)) panic("pmap_protect: unaligned addresses"); + vm_page_lock_queues(); PMAP_LOCK(pmap); while (sva < eva) { @@ -1751,6 +1755,7 @@ sva += PAGE_SIZE; } + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } ==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.39 2004/06/16 09:46:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.40 2004/07/15 20:47:36 phk Exp $"); #include #include @@ -149,7 +149,7 @@ untimeout(promtimeout, tp, promtimeouthandle); ttyld_close(tp, flag); - ttyclose(tp); + tty_close(tp); return 0; } ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_sysvec.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.92 2003/12/23 02:42:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.93 2004/07/15 08:25:59 phk Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -274,6 +274,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: + return (EOPNOTSUPP); break; } return error; ==== //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.46 2004/07/10 20:50:19 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.47 2004/07/15 20:47:36 phk Exp $"); #include #include @@ -318,7 +318,7 @@ s = spltty(); untimeout(zs_poll_intr, sc, sc->zst); ttyld_close(tp, flag); - ttyclose(tp); + tty_close(tp); splx(s); return (0); ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#20 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.484 2004/07/14 07:13:33 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.485 2004/07/15 18:00:41 alc Exp $"); /* * Manages physical address maps. @@ -1602,6 +1602,8 @@ */ if (pmap->pm_stats.resident_count == 0) return; + + vm_page_lock_queues(); PMAP_LOCK(pmap); /* @@ -1613,8 +1615,7 @@ pde = pmap_pde(pmap, sva); if (pde && (*pde & PG_PS) == 0) { pmap_remove_page(pmap, sva); - PMAP_UNLOCK(pmap); - return; + goto out; } } @@ -1684,6 +1685,8 @@ if (anyvalid) pmap_invalidate_all(pmap); +out: + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -1778,6 +1781,7 @@ anychanged = 0; + vm_page_lock_queues(); PMAP_LOCK(pmap); for (; sva < eva; sva = va_next) { @@ -1856,6 +1860,7 @@ } if (anychanged) pmap_invalidate_all(pmap); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } ==== //depot/projects/netperf_socket/sys/cam/cam_periph.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.13 2003/03/08 08:01:26 phk Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.14 2004/07/15 08:25:59 phk Exp $ */ #ifndef _CAM_CAM_PERIPH_H @@ -53,6 +53,8 @@ case MOD_UNLOAD: \ printf(#name " module unload - not possible for this module type\n"); \ return EINVAL; \ + default: \ + return EOPNOTSUPP; \ } \ return 0; \ } \ ==== //depot/projects/netperf_socket/sys/cam/cam_xpt.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.141 2004/06/21 19:01:55 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.142 2004/07/15 08:25:59 phk Exp $"); #include #include @@ -1348,6 +1348,8 @@ xpt_init(NULL); } else if (what == MOD_UNLOAD) { return EBUSY; + } else { + return EOPNOTSUPP; } return 0; ==== //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.35 2004/06/17 17:16:40 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.36 2004/07/15 08:25:59 phk Exp $"); #include "vcoda.h" @@ -90,9 +90,9 @@ case MOD_LOAD: break; case MOD_UNLOAD: - break; + return (EBUSY); default: - break; + return (EOPNOTSUPP); } return 0; } ==== //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysvec.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.36 2003/12/23 02:42:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.37 2004/07/15 08:26:00 phk Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -411,6 +411,7 @@ printf("svr4 ELF exec handler removed\n"); break; default: + return (EOPNOTSUPP); break; } return error; ==== //depot/projects/netperf_socket/sys/conf/NOTES#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1244 2004/07/11 01:44:07 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1245 2004/07/15 07:52:27 roam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1932,7 +1932,7 @@ # # The 'bktr' device is a PCI video capture device using the Brooktree # bt848/bt848a/bt849a/bt878/bt879 chipset. When used with a TV Tuner it forms a -# TV card, eg Miro PC/TV, Hauppauge WinCast/TV WinTV, VideoLogic Captivator, +# TV card, e.g. Miro PC/TV, Hauppauge WinCast/TV WinTV, VideoLogic Captivator, # Intel Smart Video III, AverMedia, IMS Turbo, FlyVideo. # # options OVERRIDE_CARD=xxx @@ -1948,11 +1948,11 @@ # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC # Specifies the default video capture mode. # This is required for Dual Crystal (28&35Mhz) boards where PAL is used -# to prevent hangs during initialisation. eg VideoLogic Captivator PCI. +# to prevent hangs during initialisation, e.g. VideoLogic Captivator PCI. # # options BKTR_USE_PLL -# PAL or SECAM users who have a 28Mhz crystal (and no 35Mhz crystal) -# must enable PLL mode with this option. eg some new Bt878 cards. +# This is required for PAL or SECAM boards with a 28Mhz crystal and no 35Mhz +# crystal, e.g. some new Bt878 cards. # # options BKTR_GPIO_ACCESS # This enable IOCTLs which give user level access to the GPIO port. ==== //depot/projects/netperf_socket/sys/conf/files.amd64#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.41 2004/07/10 23:31:17 marcel Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.42 2004/07/15 16:43:52 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -101,6 +101,7 @@ dev/fb/splash.c optional splash dev/fb/vga.c optional vga dev/fdc/fdc.c optional fdc +dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa dev/fdc/fdc_pccard.c optional fdc pccard dev/kbd/atkbd.c optional atkbd ==== //depot/projects/netperf_socket/sys/conf/files.i386#22 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.498 2004/07/13 17:43:03 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.499 2004/07/15 16:43:52 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -133,6 +133,7 @@ dev/fb/splash.c optional splash dev/fb/vga.c optional vga dev/fdc/fdc.c optional fdc +dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa dev/fdc/fdc_pccard.c optional fdc card dev/fdc/fdc_pccard.c optional fdc pccard ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#32 (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/dev/acpica/acpi.c,v 1.176 2004/07/13 18:59:49 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.177 2004/07/15 16:29:08 njl Exp $ */ #include "opt_acpi.h" @@ -111,15 +111,16 @@ static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev, ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters, ACPI_BUFFER *ret); -static ACPI_STATUS acpi_device_walk_ns(device_t bus, device_t dev, - ACPI_OBJECT_TYPE type, UINT32 max_depth, - ACPI_WALK_CALLBACK user_fn, void *context, void **ret); +static ACPI_STATUS acpi_device_scan_cb(ACPI_HANDLE h, UINT32 level, + void *context, void **retval); +static ACPI_STATUS acpi_device_scan_children(device_t bus, device_t dev, + int max_depth, acpi_scan_cb_t user_fn, void *arg); static int acpi_isa_pnp_probe(device_t bus, device_t child, - struct isa_pnp_id *ids); + struct isa_pnp_id *ids); static void acpi_probe_children(device_t bus); static int acpi_probe_order(ACPI_HANDLE handle, int *order); static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, - void *context, void **status); + void *context, void **status); static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); @@ -169,7 +170,7 @@ /* ACPI bus */ DEVMETHOD(acpi_id_probe, acpi_device_id_probe), DEVMETHOD(acpi_evaluate_object, acpi_device_eval_obj), - DEVMETHOD(acpi_walk_namespace, acpi_device_walk_ns), + DEVMETHOD(acpi_scan_children, acpi_device_scan_children), /* ISA emulation */ DEVMETHOD(isa_pnp_probe, acpi_isa_pnp_probe), @@ -1036,20 +1037,85 @@ { ACPI_HANDLE h; - if ((h = acpi_get_handle(dev)) == NULL) + if (dev == NULL) + h = ACPI_ROOT_OBJECT; + else if ((h = acpi_get_handle(dev)) == NULL) return (AE_BAD_PARAMETER); return (AcpiEvaluateObject(h, pathname, parameters, ret)); } +/* Callback arg for our implementation of walking the namespace. */ +struct acpi_device_scan_ctx { + acpi_scan_cb_t user_fn; + void *arg; + ACPI_HANDLE parent; +}; + +static ACPI_STATUS +acpi_device_scan_cb(ACPI_HANDLE h, UINT32 level, void *arg, void **retval) +{ + struct acpi_device_scan_ctx *ctx; + device_t dev, old_dev; + ACPI_STATUS status; + ACPI_OBJECT_TYPE type; + + /* + * Skip this device if we think we'll have trouble with it or it is + * the parent where the scan began. + */ + ctx = (struct acpi_device_scan_ctx *)arg; + if (acpi_avoid(h) || h == ctx->parent) + return (AE_OK); + + /* If this is not a valid device type (e.g., a method), skip it. */ + if (ACPI_FAILURE(AcpiGetType(h, &type))) + return (AE_OK); + if (type != ACPI_TYPE_DEVICE && type != ACPI_TYPE_PROCESSOR && + type != ACPI_TYPE_THERMAL && type != ACPI_TYPE_POWER) + return (AE_OK); + + /* + * Call the user function with the current device. If it is unchanged + * afterwards, return. Otherwise, we update the handle to the new dev. + */ + old_dev = acpi_get_device(h); + dev = old_dev; + status = ctx->user_fn(h, &dev, level, ctx->arg); + if (ACPI_FAILURE(status) || old_dev == dev) + return (status); + + /* Remove the old child and its connection to the handle. */ + if (old_dev != NULL) { + device_delete_child(device_get_parent(old_dev), old_dev); + AcpiDetachData(h, acpi_fake_objhandler); + } + + /* Recreate the handle association if the user created a device. */ + if (dev != NULL) + AcpiAttachData(h, acpi_fake_objhandler, dev); + + return (AE_OK); +} + static ACPI_STATUS -acpi_device_walk_ns(device_t bus, device_t dev, ACPI_OBJECT_TYPE type, - UINT32 max_depth, ACPI_WALK_CALLBACK user_fn, void *context, void **ret) +acpi_device_scan_children(device_t bus, device_t dev, int max_depth, + acpi_scan_cb_t user_fn, void *arg) { ACPI_HANDLE h; + struct acpi_device_scan_ctx ctx; + + if (acpi_disabled("children")) + return (AE_OK); - if ((h = acpi_get_handle(dev)) == NULL) + if (dev == NULL) + h = ACPI_ROOT_OBJECT; + else if ((h = acpi_get_handle(dev)) == NULL) return (AE_BAD_PARAMETER); - return (AcpiWalkNamespace(type, h, max_depth, user_fn, context, ret)); + ctx.user_fn = user_fn; + ctx.arg = arg; + ctx.parent = h; + return (AcpiWalkNamespace(ACPI_TYPE_ANY, h, max_depth, + acpi_device_scan_cb, &ctx, NULL)); } static int ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_if.m#2 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/acpica/acpi_if.m,v 1.1 2004/06/29 18:56:14 njl Exp $ +# $FreeBSD: src/sys/dev/acpica/acpi_if.m,v 1.2 2004/07/15 16:29:08 njl Exp $ # #include @@ -33,7 +33,28 @@ INTERFACE acpi; # -# Default implementation for the probe method. +# Callback function for each child handle traversed in acpi_scan_children(). +# +# ACPI_HANDLE h: current child device being considered +# +# device_t *dev: pointer to the child's original device_t or NULL if there +# was none. The callback should store a new device in *dev if it has +# created one. The method implementation will automatically clean up the +# previous device and properly associate the current ACPI_HANDLE with it. +# +# level: current level being scanned +# +# void *arg: argument passed in original call to acpi_scan_children() +# +# Returns: AE_OK if the scan should continue, otherwise an error +# +HEADER { + typedef ACPI_STATUS (*acpi_scan_cb_t)(ACPI_HANDLE h, device_t *dev, + int level, void *arg); +}; + +# +# Default implementation for acpi_id_probe(). # CODE { static char * @@ -44,7 +65,16 @@ }; # -# Probe +# Check a device for a match in a list of ID strings. The strings can be +# EISA PNP IDs or ACPI _HID/_CID values. +# +# device_t bus: parent bus for the device +# +# device_t dev: device being considered +# +# char **ids: array of ID strings to consider +# +# Returns: ID string matched or NULL if no match # METHOD char * id_probe { device_t bus; @@ -53,7 +83,22 @@ } DEFAULT acpi_generic_id_probe; # -# AcpiEvaluateObject +# Evaluate an ACPI method or object, given its path. +# +# device_t bus: parent bus for the device +# +# device_t dev: evaluate the object relative to this device's handle. +# Specify NULL to begin the search at the ACPI root. +# +# ACPI_STRING pathname: absolute or relative path to this object +# +# ACPI_OBJECT_LIST *parameters: array of arguments to pass to the object. +# Specify NULL if there are none. +# +# ACPI_BUFFER *ret: the result (if any) of the evaluation +# Specify NULL if there is none. +# +# Returns: AE_OK or an error value # METHOD ACPI_STATUS evaluate_object { device_t bus; @@ -64,14 +109,28 @@ }; # -# AcpiWalkNamespace +# Rescan a subtree and optionally reattach devices to handles. Users +# specify a callback that is called for each ACPI_HANDLE of type Device +# that is a child of "dev". +# +# device_t bus: parent bus for the device +# +# device_t dev: begin the scan starting with this device's handle. +# Specify NULL to begin the scan at the ACPI root. +# +# int max_depth: number of levels to traverse (i.e., 1 means just the +# immediate children. +# +# acpi_scan_cb_t user_fn: called for each child handle +# +# void *arg: argument to pass to the callback function +# +# Returns: AE_OK or an error value, based on the callback return value # -METHOD ACPI_STATUS walk_namespace { +METHOD ACPI_STATUS scan_children { device_t bus; device_t dev; - ACPI_OBJECT_TYPE type; - UINT32 max_depth; - ACPI_WALK_CALLBACK user_fn; - void *context; - void **ret; + int max_depth; + acpi_scan_cb_t user_fn; + void *arg; }; ==== //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_osm.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.16 2003/12/17 00:02:09 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.17 2004/07/15 08:26:00 phk Exp $"); #include #include @@ -1540,6 +1540,7 @@ ahd_modevent(module_t mod, int type, void *data) { /* XXX Deal with busy status on unload. */ + /* XXX Deal with unknown events */ return 0; } ==== //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.39 2003/12/17 00:02:10 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.40 2004/07/15 08:26:00 phk Exp $"); #include #include @@ -1663,6 +1663,7 @@ ahc_modevent(module_t mod, int type, void *data) { /* XXX Deal with busy status on unload. */ + /* XXX Deal with unknown events */ return 0; } ==== //depot/projects/netperf_socket/sys/dev/bktr/bktr_mem.c#4 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.10 2004/06/11 18:47:44 schweikh Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.11 2004/07/15 08:26:00 phk Exp $"); #include #include @@ -88,6 +88,7 @@ printf("bktr_mem: memory holder cannot be unloaded\n"); return EBUSY; default: + return EOPNOTSUPP; break; } return (0); ==== //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.26 2004/07/11 15:18:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.27 2004/07/15 20:47:37 phk Exp $"); #include @@ -1640,7 +1640,7 @@ cx_set_rts (d->chan, 0); ttydtrwaitstart(d->tty); } - ttyclose (d->tty); + tty_close (d->tty); splx (s); d->callout = 0; ==== //depot/projects/netperf_socket/sys/dev/cy/cy.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.158 2004/07/11 15:18:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.159 2004/07/15 20:47:37 phk Exp $"); #include "opt_compat.h" @@ -786,7 +786,7 @@ ttyld_close(tp, flag); disc_optim(tp, &tp->t_termios, com); comhardclose(com); - ttyclose(tp); + tty_close(tp); siosettimeout(); splx(s); #ifdef broken /* session holds a ref to the tty; can't deallocate */ ==== //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $ - * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.14 2004/07/13 09:41:45 simokawa Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.16 2004/07/15 20:47:37 phk Exp $ */ #include @@ -230,7 +230,7 @@ tp = dev->si_tty; if (tp->t_state & TS_ISOPEN) { ttyld_close(tp, flag); - ttyclose(tp); + tty_close(tp); } return (0); @@ -597,7 +597,7 @@ if (tp->t_state & TS_ISOPEN) { printf("dcons: still opened\n"); ttyld_close(tp, 0); - ttyclose(tp); + tty_close(tp); } /* XXX * must wait until all device are closed. @@ -651,6 +651,9 @@ break; case MOD_SHUTDOWN: break; + default: + err = EOPNOTSUPP; + break; } return(err); } ==== //depot/projects/netperf_socket/sys/dev/digi/digi.c#13 (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/dev/digi/digi.c,v 1.53 2004/07/13 19:36:58 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.54 2004/07/15 20:47:37 phk Exp $ */ /*- @@ -893,7 +893,7 @@ ttyld_close(tp, flag); ttyldoptim(tp); digihardclose(port); - ttyclose(tp); + tty_close(tp); if (--sc->opencnt == 0) splx(s); return (0); ==== //depot/projects/netperf_socket/sys/dev/fb/fb.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/fb.c,v 1.31 2004/02/21 21:10:42 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/fb.c,v 1.32 2004/07/15 08:26:00 phk Exp $"); #include "opt_fb.h" @@ -386,6 +386,8 @@ case MOD_UNLOAD: printf("fb module unload - not possible for this module type\n"); return EINVAL; + default: + return EOPNOTSUPP; } return 0; } ==== //depot/projects/netperf_socket/sys/dev/fb/splashreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/splashreg.h,v 1.5 2000/04/29 13:33:18 peter Exp $ + * $FreeBSD: src/sys/dev/fb/splashreg.h,v 1.6 2004/07/15 08:26:01 phk Exp $ */ #ifndef _DEV_FB_SPLASHREG_H_ @@ -55,6 +55,7 @@ case MOD_UNLOAD: \ return splash_unregister(&sw); \ default: \ + return EOPNOTSUPP; \ break; \ } \ return 0; \ @@ -76,6 +77,7 @@ case MOD_UNLOAD: \ return splash_unregister(&sw); \ default: \ + return EOPNOTSUPP; \ break; \ } \ return 0; \ ==== //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#6 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.280 2004/07/14 07:04:17 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.281 2004/07/15 16:39:40 njl Exp $"); #include "opt_fdc.h" @@ -241,7 +241,6 @@ static int fd_sense_drive_status(fdc_p, int *); static int fd_sense_int(fdc_p, int *, int *); static int fd_read_status(fdc_p); -static void fdc_add_child(device_t, const char *, int); static int fd_probe(device_t); static int fd_attach(device_t); static int fd_detach(device_t); @@ -517,29 +516,38 @@ device_t dev; dev = fdc->fdc_dev; + if (fdc->fdc_intr) { + BUS_TEARDOWN_INTR(device_get_parent(dev), dev, fdc->res_irq, + fdc->fdc_intr); + fdc->fdc_intr = NULL; + } if (fdc->res_irq != 0) { bus_deactivate_resource(dev, SYS_RES_IRQ, fdc->rid_irq, fdc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, fdc->rid_irq, fdc->res_irq); + fdc->res_irq = NULL; } if (fdc->res_ctl != 0) { bus_deactivate_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl, fdc->res_ctl); bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl, fdc->res_ctl); + fdc->res_ctl = NULL; } if (fdc->res_ioport != 0) { bus_deactivate_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport, fdc->res_ioport); bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport, fdc->res_ioport); + fdc->res_ioport = NULL; } if (fdc->res_drq != 0) { bus_deactivate_resource(dev, SYS_RES_DRQ, fdc->rid_drq, fdc->res_drq); bus_release_resource(dev, SYS_RES_DRQ, fdc->rid_drq, fdc->res_drq); + fdc->res_ioport = NULL; } } @@ -613,14 +621,6 @@ /* reset controller, turn motor off */ fdout_wr(fdc, 0); - if ((fdc->flags & FDC_ATTACHED) == 0) { - device_printf(dev, "already unloaded\n"); - return (0); - } - fdc->flags &= ~FDC_ATTACHED; - - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, fdc->res_irq, - fdc->fdc_intr); fdc_release_resources(fdc); return (0); } @@ -628,38 +628,36 @@ /* * Add a child device to the fdc controller. It will then be probed etc. */ -static void +device_t fdc_add_child(device_t dev, const char *name, int unit) { - int fdu, flags; + int flags; struct fdc_ivars *ivar; device_t child; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 16 01:55:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4C4116A4D0; Fri, 16 Jul 2004 01:55:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF43216A4CE for ; Fri, 16 Jul 2004 01:55:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5ED043D3F for ; Fri, 16 Jul 2004 01:55:22 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6G1tMK5078391 for ; Fri, 16 Jul 2004 01:55:22 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6G1tMwh078388 for perforce@freebsd.org; Fri, 16 Jul 2004 01:55:22 GMT (envelope-from marcel@freebsd.org) Date: Fri, 16 Jul 2004 01:55:22 GMT Message-Id: <200407160155.i6G1tMwh078388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 01:55:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=57432 Change 57432 by marcel@marcel_nfs on 2004/07/16 01:55:12 IFC @57429 Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#1 branch .. //depot/projects/gdb/include/Makefile#9 integrate .. //depot/projects/gdb/include/proc_service.h#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#22 integrate .. //depot/projects/gdb/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/gdb/lib/libthread_db/Makefile#5 integrate .. //depot/projects/gdb/lib/libthread_db/include/thread_db.h#1 branch .. //depot/projects/gdb/lib/libthread_db/include/thread_db_int.h#1 branch .. //depot/projects/gdb/lib/libthread_db/pthread/Makefile#1 branch .. //depot/projects/gdb/lib/libthread_db/pthread/pthread_db.c#1 branch .. //depot/projects/gdb/lib/libthread_db/pthread/pthread_db.h#1 branch .. //depot/projects/gdb/lib/libthread_db/pthread/pthread_db_i386.c#1 branch .. //depot/projects/gdb/lib/libthread_db/src/Makefile#1 branch .. //depot/projects/gdb/lib/libthread_db/src/thread_db.c#1 branch .. //depot/projects/gdb/release/Makefile#7 integrate .. //depot/projects/gdb/release/alpha/mkisoimages.sh#4 integrate .. //depot/projects/gdb/release/amd64/mkisoimages.sh#4 integrate .. //depot/projects/gdb/release/i386/mkisoimages.sh#4 integrate .. //depot/projects/gdb/release/ia64/mkisoimages.sh#4 integrate .. //depot/projects/gdb/release/scripts/print-cdrom-packages.sh#6 integrate .. //depot/projects/gdb/release/sparc64/mkisoimages.sh#4 integrate .. //depot/projects/gdb/sbin/geom/core/geom.8#3 integrate .. //depot/projects/gdb/share/dict/freebsd#3 integrate .. //depot/projects/gdb/share/examples/Makefile#2 integrate .. //depot/projects/gdb/share/examples/worm/README#2 delete .. //depot/projects/gdb/share/examples/worm/makecdfs.sh#2 delete .. //depot/projects/gdb/share/man/man4/adw.4#2 integrate .. //depot/projects/gdb/share/man/man4/amr.4#2 integrate .. //depot/projects/gdb/share/man/man4/asr.4#3 integrate .. //depot/projects/gdb/share/man/man4/ed.4#2 integrate .. //depot/projects/gdb/share/man/man4/fdc.4#2 integrate .. //depot/projects/gdb/share/man/man4/my.4#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#13 integrate .. //depot/projects/gdb/sys/alpha/alpha/promcons.c#6 integrate .. //depot/projects/gdb/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#9 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/gdb/sys/amd64/include/pmap.h#10 integrate .. //depot/projects/gdb/sys/cam/cam_periph.h#2 integrate .. //depot/projects/gdb/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/gdb/sys/coda/coda_fbsd.c#6 integrate .. //depot/projects/gdb/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/gdb/sys/conf/NOTES#33 integrate .. //depot/projects/gdb/sys/conf/files#41 integrate .. //depot/projects/gdb/sys/conf/files.amd64#15 integrate .. //depot/projects/gdb/sys/conf/files.i386#23 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cmbat.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#14 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_mem.c#4 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#14 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#13 integrate .. //depot/projects/gdb/sys/dev/dcons/dcons.c#13 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#14 integrate .. //depot/projects/gdb/sys/dev/fb/fb.c#3 integrate .. //depot/projects/gdb/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc_acpi.c#1 branch .. //depot/projects/gdb/sys/dev/fdc/fdc_isa.c#3 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc_pccard.c#4 integrate .. //depot/projects/gdb/sys/dev/fdc/fdcvar.h#3 integrate .. //depot/projects/gdb/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/gdb/sys/dev/harp/if_harp.c#3 integrate .. //depot/projects/gdb/sys/dev/hfa/hfa_freebsd.c#3 integrate .. //depot/projects/gdb/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/gdb/sys/dev/md/md.c#11 integrate .. //depot/projects/gdb/sys/dev/nmdm/nmdm.c#11 integrate .. //depot/projects/gdb/sys/dev/null/null.c#5 integrate .. //depot/projects/gdb/sys/dev/ofw/ofw_console.c#10 integrate .. //depot/projects/gdb/sys/dev/ofw/openpromio.c#4 integrate .. //depot/projects/gdb/sys/dev/random/randomdev.c#11 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#12 integrate .. //depot/projects/gdb/sys/dev/rp/rp.c#9 integrate .. //depot/projects/gdb/sys/dev/sab/sab.c#13 integrate .. //depot/projects/gdb/sys/dev/si/si.c#10 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#21 integrate .. //depot/projects/gdb/sys/dev/snp/snp.c#8 integrate .. //depot/projects/gdb/sys/dev/sound/driver.c#3 integrate .. //depot/projects/gdb/sys/dev/streams/streams.c#4 integrate .. //depot/projects/gdb/sys/dev/sx/sx.c#9 integrate .. //depot/projects/gdb/sys/dev/syscons/syscons.c#13 integrate .. //depot/projects/gdb/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/gdb/sys/dev/syscons/sysmouse.c#6 integrate .. //depot/projects/gdb/sys/dev/uart/uart_tty.c#9 integrate .. //depot/projects/gdb/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/ubser.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/gdb/sys/dev/utopia/utopia.c#4 integrate .. //depot/projects/gdb/sys/dev/vinum/vinum.c#5 integrate .. //depot/projects/gdb/sys/dev/zs/zs.c#11 integrate .. //depot/projects/gdb/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/gdb/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/gdb/sys/geom/gate/g_gate.c#9 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/gdb/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/gdb/sys/i386/i386/swtch.s#5 integrate .. //depot/projects/gdb/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_drv.c#7 integrate .. //depot/projects/gdb/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/gdb/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/gdb/sys/i4b/include/i4b_global.h#2 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#11 integrate .. //depot/projects/gdb/sys/ia64/ia64/ssc.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/gdb/sys/kern/kern_event.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_mac.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_module.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/gdb/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#13 integrate .. //depot/projects/gdb/sys/kern/tty.c#14 integrate .. //depot/projects/gdb/sys/kern/tty_conf.c#6 integrate .. //depot/projects/gdb/sys/kern/tty_pty.c#13 integrate .. //depot/projects/gdb/sys/kern/tty_subr.c#2 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#23 integrate .. //depot/projects/gdb/sys/kern/vfs_init.c#5 integrate .. //depot/projects/gdb/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/gdb/sys/libkern/qsort.c#3 integrate .. //depot/projects/gdb/sys/libkern/qsort_r.c#1 branch .. //depot/projects/gdb/sys/modules/fdc/Makefile#5 integrate .. //depot/projects/gdb/sys/modules/sound/sound/Makefile#1 branch .. //depot/projects/gdb/sys/net/if_disc.c#6 integrate .. //depot/projects/gdb/sys/net/if_ef.c#4 integrate .. //depot/projects/gdb/sys/net/if_faith.c#8 integrate .. //depot/projects/gdb/sys/net/if_gif.c#8 integrate .. //depot/projects/gdb/sys/net/if_gre.c#8 integrate .. //depot/projects/gdb/sys/net/if_loop.c#7 integrate .. //depot/projects/gdb/sys/net/if_ppp.c#7 integrate .. //depot/projects/gdb/sys/net/if_sl.c#10 integrate .. //depot/projects/gdb/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/gdb/sys/net/if_stf.c#8 integrate .. //depot/projects/gdb/sys/net/if_tun.c#9 integrate .. //depot/projects/gdb/sys/net/if_var.h#15 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#10 integrate .. //depot/projects/gdb/sys/net/ppp_tty.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/gdb/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_fec.c#7 integrate .. //depot/projects/gdb/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/gdb/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/gdb/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/gdb/sys/netinet6/ip6_fw.c#3 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/gdb/sys/pc98/conf/NOTES#15 integrate .. //depot/projects/gdb/sys/pc98/pc98/fd.c#10 integrate .. //depot/projects/gdb/sys/pc98/pc98/fdc_cbus.c#3 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#18 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/pmap.c#11 integrate .. //depot/projects/gdb/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/gdb/sys/sys/event.h#3 integrate .. //depot/projects/gdb/sys/sys/eventvar.h#2 integrate .. //depot/projects/gdb/sys/sys/exec.h#3 integrate .. //depot/projects/gdb/sys/sys/libkern.h#4 integrate .. //depot/projects/gdb/sys/sys/procfs.h#5 integrate .. //depot/projects/gdb/sys/sys/tty.h#13 integrate .. //depot/projects/gdb/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#12 integrate .. //depot/projects/gdb/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/gdb/usr.bin/basename/basename.c#2 integrate .. //depot/projects/gdb/usr.bin/checknr/checknr.c#2 integrate .. //depot/projects/gdb/usr.bin/col/col.1#3 integrate .. //depot/projects/gdb/usr.bin/colcrt/colcrt.1#2 integrate .. //depot/projects/gdb/usr.bin/colcrt/colcrt.c#2 integrate .. //depot/projects/gdb/usr.bin/colrm/colrm.1#2 integrate .. //depot/projects/gdb/usr.bin/column/column.1#2 integrate .. //depot/projects/gdb/usr.bin/column/column.c#2 integrate .. //depot/projects/gdb/usr.bin/du/du.c#6 integrate .. //depot/projects/gdb/usr.bin/fmt/fmt.c#2 integrate .. //depot/projects/gdb/usr.bin/killall/killall.c#3 integrate .. //depot/projects/gdb/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/gdb/usr.bin/pkill/pkill.c#4 integrate .. //depot/projects/gdb/usr.bin/rs/rs.c#2 integrate .. //depot/projects/gdb/usr.bin/sed/compile.c#2 integrate .. //depot/projects/gdb/usr.bin/sed/defs.h#2 integrate .. //depot/projects/gdb/usr.bin/sed/main.c#3 integrate .. //depot/projects/gdb/usr.bin/sed/misc.c#2 integrate .. //depot/projects/gdb/usr.bin/sed/process.c#3 integrate .. //depot/projects/gdb/usr.bin/sed/sed.1#4 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#22 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#11 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar_platform.h#3 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#11 integrate .. //depot/projects/gdb/usr.bin/tr/cmap.c#2 integrate .. //depot/projects/gdb/usr.bin/tr/cset.c#3 integrate .. //depot/projects/gdb/usr.bin/tr/cset.h#2 integrate .. //depot/projects/gdb/usr.bin/whereis/whereis.c#2 integrate .. //depot/projects/gdb/usr.bin/xstr/xstr.c#2 integrate .. //depot/projects/gdb/usr.sbin/amd/include/config.h#3 integrate .. //depot/projects/gdb/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/radius.c#4 integrate .. //depot/projects/gdb/usr.sbin/usbd/usbd.conf.5#2 integrate Differences ... ==== //depot/projects/gdb/include/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.216 2004/07/05 23:13:16 das Exp $ +# $FreeBSD: src/include/Makefile,v 1.217 2004/07/15 03:43:18 davidxu Exp $ # # Doing a "make install" builds /usr/include. @@ -12,7 +12,7 @@ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \ netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \ - pthread.h \ + proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \ stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ ==== //depot/projects/gdb/include/proc_service.h#4 (text+ko) ==== ==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.30 2004/07/10 18:10:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.31 2004/07/15 03:13:27 kientzle Exp $"); #include #include @@ -72,7 +72,7 @@ struct extract { mode_t umask; mode_t default_dir_mode; - struct archive_string mkdirpath; + struct archive_string create_parent_dir; struct fixup_entry *fixup_list; struct fixup_entry *current_fixup; @@ -110,9 +110,11 @@ static int extract_symlink(struct archive *, struct archive_entry *, int); static gid_t lookup_gid(struct archive *, const char *uname, gid_t); static uid_t lookup_uid(struct archive *, const char *uname, uid_t); -static int mkdirpath(struct archive *, const char *, int flags); -static int mkdirpath_internal(struct archive *, char *, int flags); -static int mkdirpath_recursive(struct archive *, char *, int flags); +static int create_parent_dir(struct archive *, const char *, int flags); +static int create_parent_dir_internal(struct archive *, char *, + int flags); +static int create_parent_dir_recursive(struct archive *, char *, + int flags); static int restore_metadata(struct archive *, struct archive_entry *, int flags); #ifdef HAVE_POSIX_ACL @@ -275,7 +277,7 @@ p = next; } extract->fixup_list = NULL; - archive_string_free(&extract->mkdirpath); + archive_string_free(&extract->create_parent_dir); free(a->extract); a->extract = NULL; } @@ -409,7 +411,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (fd < 0) { - mkdirpath(a, name, flags); + create_parent_dir(a, name, flags); fd = open(name, O_WRONLY | O_CREAT | O_EXCL, mode); } if (fd < 0) { @@ -434,8 +436,9 @@ extract->pst = NULL; /* Invalidate cached stat data. */ /* Copy path to mutable storage. */ - archive_strcpy(&(extract->mkdirpath), archive_entry_pathname(entry)); - path = extract->mkdirpath.s; + archive_strcpy(&(extract->create_parent_dir), + archive_entry_pathname(entry)); + path = extract->create_parent_dir.s; /* Deal with any troublesome trailing path elements. */ for (;;) { @@ -477,7 +480,7 @@ unlink(path); } else { /* Doesn't already exist; try building the parent path. */ - if (mkdirpath_internal(a, path, flags) != ARCHIVE_OK) + if (create_parent_dir_internal(a, path, flags) != ARCHIVE_OK) return (ARCHIVE_WARN); } @@ -512,24 +515,26 @@ * path into mutable storage first. */ static int -mkdirpath(struct archive *a, const char *path, int flags) +create_parent_dir(struct archive *a, const char *path, int flags) { struct extract *extract; + int r; extract = a->extract; /* Copy path to mutable storage. */ - archive_strcpy(&(extract->mkdirpath), path); + archive_strcpy(&(extract->create_parent_dir), path); - return (mkdirpath_internal(a, extract->mkdirpath.s, flags)); + r = create_parent_dir_internal(a, extract->create_parent_dir.s, flags); + return (r); } /* - * Handle remaining setup for mkdirpath_recursive(), assuming + * Handle remaining setup for create_parent_dir_recursive(), assuming * path is already in mutable storage. */ static int -mkdirpath_internal(struct archive *a, char *path, int flags) +create_parent_dir_internal(struct archive *a, char *path, int flags) { char *slash; mode_t old_umask; @@ -541,7 +546,7 @@ return (ARCHIVE_OK); *slash = '\0'; old_umask = umask(~SECURE_DIR_MODE); - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); umask(old_umask); *slash = '/'; return (r); @@ -554,7 +559,7 @@ * Otherwise, returns ARCHIVE_WARN. */ static int -mkdirpath_recursive(struct archive *a, char *path, int flags) +create_parent_dir_recursive(struct archive *a, char *path, int flags) { struct stat st; struct extract *extract; @@ -579,7 +584,7 @@ /* Don't bother trying to create null path, '.', or '..'. */ if (slash != NULL) { *slash = '\0'; - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); *slash = '/'; return (r); } @@ -611,7 +616,7 @@ return (ARCHIVE_WARN); } else if (slash != NULL) { *slash = '\0'; - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); *slash = '/'; if (r != ARCHIVE_OK) return (r); @@ -658,7 +663,7 @@ if (r != 0) { /* Might be a non-existent parent dir; try fixing that. */ - mkdirpath(a, pathname, flags); + create_parent_dir(a, pathname, flags); r = link(linkname, pathname); } @@ -695,7 +700,7 @@ if (r != 0) { /* Might be a non-existent parent dir; try fixing that. */ - mkdirpath(a, pathname, flags); + create_parent_dir(a, pathname, flags); r = symlink(linkname, pathname); } @@ -728,7 +733,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (r != 0 && errno == ENOENT) { - mkdirpath(a, archive_entry_pathname(entry), flags); + create_parent_dir(a, archive_entry_pathname(entry), flags); r = mknod(archive_entry_pathname(entry), mode, archive_entry_rdev(entry)); } @@ -777,7 +782,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (r != 0 && errno == ENOENT) { - mkdirpath(a, archive_entry_pathname(entry), flags); + create_parent_dir(a, archive_entry_pathname(entry), flags); r = mkfifo(archive_entry_pathname(entry), archive_entry_mode(entry)); } ==== //depot/projects/gdb/lib/libc/sys/getfsstat.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsstat.2 8.3 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.16 2003/11/21 01:30:28 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.17 2004/07/16 01:18:13 alfred Exp $ .\" .Dd November 20, 2003 .Dt GETFSSTAT 2 @@ -63,8 +63,13 @@ The buffer is filled with an array of .Fa fsstat structures, one for each mounted file system -up to the size specified by +up to the byte count specified by .Fa bufsize . +Note, the +.Fa bufsize +argument is the number of bytes that +.Fa buf +can hold, not the count of statfs structures it will hold. .Pp If .Fa buf ==== //depot/projects/gdb/lib/libthread_db/Makefile#5 (text+ko) ==== ==== //depot/projects/gdb/release/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.845 2004/06/10 19:33:26 brian Exp $ +# $FreeBSD: src/release/Makefile,v 1.846 2004/07/15 04:52:57 jhb Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -314,6 +314,18 @@ @echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!" @exit 1 .endif +.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) +.for p in ${LOCAL_PATCHES} +.if !exists(${p}) + @echo "The patch file ${p} does not exist!" + @exit 1 +.endif +.endfor +.endif +.if defined(LOCAL_SCRIPT) && !exists(${LOCAL_SCRIPT}) + @echo "The local script ${LOCAL_SCRIPT} does not exist!" + @exit 1 +.endif .if make(release) .if exists(${CHROOTDIR}) # The first command will fail on a handful of files that have their schg @@ -347,12 +359,10 @@ .endif .if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) .for p in ${LOCAL_PATCHES} -.if exists(${p}) patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p} -.endif .endfor .endif -.if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) +.if defined(LOCAL_SCRIPT) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} \ RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} .endif ==== //depot/projects/gdb/release/alpha/mkisoimages.sh#4 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.10 2004/07/15 09:28:02 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" + if [ "x$1" = "x-b" ]; then bootable="yes" shift @@ -50,7 +52,7 @@ LABEL=$1; shift NAME=$1; shift -mkisofs -r -J -V $LABEL -o $NAME $* +mkisofs -r -J -V $LABEL -P "$publisher" -o $NAME $* type setcdboot 2>&1 | grep " is " >/dev/null if [ $? -ne 0 ]; then ==== //depot/projects/gdb/release/amd64/mkisoimages.sh#4 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.10 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" if [ "x$1" = "x-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-b boot/cdboot -no-emul-boot" @@ -53,4 +54,4 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* ==== //depot/projects/gdb/release/i386/mkisoimages.sh#4 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.10 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" + if [ "x$1" = "x-b" ]; then bootable="-b boot/cdboot -no-emul-boot" shift @@ -55,4 +57,4 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* ==== //depot/projects/gdb/release/ia64/mkisoimages.sh#4 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.7 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.8 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" set -e # The hackery function is to help with the development of the release @@ -91,6 +92,6 @@ BOOTOPTS="-b $EFIPART -no-emul-boot" fi -mkisofs $BOOTOPTS -r -J -V $LABEL -o $NAME $BASE $* +mkisofs $BOOTOPTS -r -J -V $LABEL -P "$publisher" -o $NAME $BASE $* rm -f $BASE/$EFIPART exit 0 ==== //depot/projects/gdb/release/scripts/print-cdrom-packages.sh#6 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.57 2004/05/03 00:47:35 marcel Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.58 2004/07/15 18:22:21 cperciva Exp $ # # MAINTAINER: re # @@ -138,6 +138,9 @@ CDROM_SET_1="${CDROM_SET_1} print/ghostscript-gnu-nox11" CDROM_SET_1="${CDROM_SET_1} print/gv" CDROM_SET_1="${CDROM_SET_1} print/psutils-letter" +if [ ! "X{PKG_ARCH}" = "Xia64" ]; then +CDROM_SET_1="${CDROM_SET_1} security/freebsd-update" +fi CDROM_SET_1="${CDROM_SET_1} security/sudo" CDROM_SET_1="${CDROM_SET_1} shells/bash2" CDROM_SET_1="${CDROM_SET_1} shells/pdksh" ==== //depot/projects/gdb/release/sparc64/mkisoimages.sh#4 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.5 2004/07/12 07:59:25 kris Exp $ +# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.6 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" IMG=/tmp/bootfs MNT=/mnt @@ -65,5 +66,5 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* rm -f ${IMG} ==== //depot/projects/gdb/sbin/geom/core/geom.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.2 2004/07/07 21:00:57 ru Exp $ +.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.3 2004/07/14 13:32:00 pjd Exp $ .\" .Dd May 21, 2004 .Dt GEOM 8 @@ -111,6 +111,7 @@ .Sh SEE ALSO .Xr geom 4 , .Xr gconcat 8 , +.Xr glabel 8 , .Xr gnop 8 , .Xr gstripe 8 .Sh HISTORY ==== //depot/projects/gdb/share/dict/freebsd#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/share/dict/freebsd,v 1.8 2004/07/14 05:23:16 murray Exp $ +$FreeBSD: src/share/dict/freebsd,v 1.9 2004/07/14 07:10:15 murray Exp $ ABI ACL ACPI @@ -197,7 +197,6 @@ cleartext committer contrib -curmudgeon devfs dialup diff ==== //depot/projects/gdb/share/examples/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/Makefile,v 1.41 2003/10/26 19:09:12 emax Exp $ +# $FreeBSD: src/share/examples/Makefile,v 1.42 2004/07/15 15:37:56 scottl Exp $ # # Doing a make install builds /usr/share/examples @@ -32,8 +32,7 @@ slattach \ sliplogin \ startslip \ - sunrpc \ - worm + sunrpc XFILES= BSD_daemon/FreeBSD.pfa \ BSD_daemon/README \ @@ -248,9 +247,7 @@ sunrpc/sort/Makefile \ sunrpc/sort/rsort.c \ sunrpc/sort/sort.x \ - sunrpc/sort/sort_proc.c \ - worm/README \ - worm/makecdfs.sh + sunrpc/sort/sort_proc.c BINDIR= ${SHAREDIR}/examples ==== //depot/projects/gdb/share/man/man4/adw.4#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/adw.4,v 1.16 2001/10/13 09:08:30 yokota Exp $ +.\" $FreeBSD: src/share/man/man4/adw.4,v 1.17 2004/07/14 21:58:17 simon Exp $ .\" -.Dd February 13, 2000 +.Dd July 14, 2004 .Dt ADW 4 .Os .Sh NAME @@ -43,13 +43,6 @@ and .Tn ASC38C0800 Ultra2 , SCSI Host Adapter chips. -AdvanSys products incorporating these chips include the -.Tn ABP[3]940UW , -.Tn ABP950UW , -.Tn ABP970UW , -.Tn ABP3940U2W , -and -.Tn ABP3950U2W . Both chips support, synchronous transfers (20MHz and 40MHz max respectively), 16bit transfers, tagged queueing, @@ -66,6 +59,23 @@ per target is not honored as the CAM SCSI system will automatically determine the maximum number of tags a device can receive as well as guarantee fair resource allocation among devices. +.Sh HARDWARE +The +.Nm +driver supports SCSI controllers including: +.Pp +.Bl -bullet -compact +.It +AdvanSys ABP940UW/ABP3940UW +.It +AdvanSys ABP950UW +.It +AdvanSys ABP970UW +.It +AdvanSys ABP3940U2W +.It +AdvanSys ABP3950U2W +.El .Sh SEE ALSO .Xr adv 4 , .Xr cd 4 , ==== //depot/projects/gdb/share/man/man4/amr.4#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/amr.4,v 1.20 2003/12/23 16:22:34 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/amr.4,v 1.21 2004/07/14 21:58:17 simon Exp $ .\" -.Dd January 23, 2000 +.Dd July 14, 2004 .Dt AMR 4 .Os .Sh NAME @@ -38,41 +38,44 @@ driver provides support for American Megatrends MegaRAID Express, Elite and Enterprise family SCSI RAID controllers, including models relabeled and sold by Hewlett-Packard and Dell. -Supported controllers include: +.Sh HARDWARE +The +.Nm +driver supports the following: .Pp .Bl -bullet -compact .It -MegaRAID 320-1 +AMI MegaRAID 320-1 .It -MegaRAID 320-2 +AMI MegaRAID 320-2 .It -MegaRAID 320-4X +AMI MegaRAID 320-4X .It -MegaRAID Series 418 +AMI MegaRAID Series 418 .It -MegaRAID Enterprise 1200 (Series 428) +AMI MegaRAID Enterprise 1200 (Series 428) .It -MegaRAID Enterprise 1300 (Series 434) +AMI MegaRAID Enterprise 1300 (Series 434) .It -MegaRAID Enterprise 1400 (Series 438) +AMI MegaRAID Enterprise 1400 (Series 438) .It -MegaRAID Enterprise 1500 (Series 467) +AMI MegaRAID Enterprise 1500 (Series 467) .It -MegaRAID Enterprise 1600 (Series 471) +AMI MegaRAID Enterprise 1600 (Series 471) .It -MegaRAID Elite 1500 (Series 467) +AMI MegaRAID Elite 1500 (Series 467) .It -MegaRAID Elite 1600 (Series 493) +AMI MegaRAID Elite 1600 (Series 493) .It -MegaRAID Elite 1650 (Series 4xx) +AMI MegaRAID Elite 1650 (Series 4xx) .It -MegaRAID Express 100 (Series 466WS) +AMI MegaRAID Express 100 (Series 466WS) .It -MegaRAID Express 200 (Series 466) +AMI MegaRAID Express 200 (Series 466) .It -MegaRAID Express 300 (Series 490) +AMI MegaRAID Express 300 (Series 490) .It -MegaRAID Express 500 (Series 475) +AMI MegaRAID Express 500 (Series 475) .It Dell PERC .It ==== //depot/projects/gdb/share/man/man4/asr.4#3 (text+ko) ==== @@ -4,9 +4,9 @@ .\" .\" Manpage cleanup by: Jeroen Ruigrok van der Werven .\" -.\" $FreeBSD: src/share/man/man4/asr.4,v 1.22 2004/05/02 17:17:19 schweikh Exp $ +.\" $FreeBSD: src/share/man/man4/asr.4,v 1.23 2004/07/14 21:58:17 simon Exp $ .\" -.Dd October 27, 2000 +.Dd July 14, 2004 .Dt ASR 4 .Os .Sh NAME @@ -22,9 +22,30 @@ SmartRAID SCSI RAID adapters through the standard SCSI disk .Xr da 4 interface. -The adapters currently supported include the following RAID adapters: +.Pp +The supported adapters provide 64 bit PCI, +Compact PCI, Zero Channel PCI, +and up to four channels of Ultra2, Ultra 160, or Ultra320 SCSI, +or two channels of 1GB Fibre. +All support RAID-0, RAID-1, RAID-10, RAID-5 and RAID-50 arrays. +All SCSI target types are supported. +For the ATA based controllers, one IDE drive per channel is supported. +Hot-swapping of IDE drives is not supported at this time. +.Pp +All host bus adapters must be configured +before they can be used with any operating system. +Please contact Adaptec directly to obtain the latest information +on configuration utilities for the adapters. +Currently there are both a Motif based GUI configuration utility +and a CLI based configuration utility available from the Adaptec Web site. +The cards and arrays can also be configured via the BIOS based configuration +tool (SMOR). +.Sh HARDWARE +The adapters currently supported by the +.Nm +driver include the following: .Pp -.Bl -item -compact +.Bl -bullet -compact .It Adaptec Zero-Channel SCSI RAID 2000S, 2005S, 2010S, 2015S .It @@ -59,24 +80,6 @@ DEC KZPCC-XC (LVD 1-ch, 16MB cache), DEC KZPCC-XE (LVD 3-ch, 64MB cache) -- rebadged SmartRAID V Millennium .El -.Pp -These adapters provide 64 bit PCI, -Compact PCI, Zero Channel PCI, -and up to four channels of Ultra2, Ultra 160, or Ultra320 SCSI, -or two channels of 1GB Fibre. -All support RAID-0, RAID-1, RAID-10, RAID-5 and RAID-50 arrays. -All SCSI target types are supported. -For the ATA based controllers, one IDE drive per channel is supported. -Hot-swapping of IDE drives is not supported at this time. -.Pp -All host bus adapters must be configured -before they can be used with any operating system. -Please contact Adaptec directly to obtain the latest information -on configuration utilities for the adapters. -Currently there are both a Motif based GUI configuration utility -and a CLI based configuration utility available from the Adaptec Web site. -The cards and arrays can also be configured via the BIOS based configuration -tool (SMOR). .Sh FILES .Bl -tag -width "/dev/asr*" -compact .It Pa /dev/asr* ==== //depot/projects/gdb/share/man/man4/ed.4#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ed.4,v 1.35 2003/02/15 17:12:53 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/ed.4,v 1.36 2004/07/14 21:58:17 simon Exp $ .\" -.Dd October 7, 2001 +.Dd July 14, 2004 .Dt ED 4 .Os .Sh NAME @@ -45,12 +45,6 @@ driver provides support for 8 and 16bit ethernet cards that are based on the National Semiconductor DS8390 and similar NICs manufactured by other companies. .Pp -It supports all 80x3 series ethernet cards manufactured by Western Digital and SMC, -the SMC Ultra, the 3Com 3c503, the Novell NE1000/NE2000 and compatible cards, -the HP PC Lan+, the RealTek 8029, -and the Digital Equipment EtherWorks DE305 card. -ISA, PCI and PC Card devices are supported. -.Pp The .Nm driver uses a unique multi-buffering mechanism to achieve high transmit performance. @@ -104,6 +98,29 @@ option to .Xr ifconfig 8 (BNC is the default). +.Sh HARDWARE +The +.Nm +driver supports the following Ethernet NICs: +.Pp +.Bl -bullet -compact +.It +3Com 3c503 +.It +Digital Equipment EtherWorks DE305 +.It +HP PC Lan+ +.It +Novell NE1000/NE2000 and compatible +.It +RealTek 8029 +.It +SMC Ultra +.It +Western Digital and SMC 80x3 series +.El +.Pp +ISA, PCI and PC Card devices are supported. .Sh DIAGNOSTICS .Bl -diag .It "ed%d: kernel configured irq %d doesn't match board configured irq %d." ==== //depot/projects/gdb/share/man/man4/fdc.4#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/fdc.4,v 1.33 2003/09/08 19:57:19 ru Exp $ +.\" $FreeBSD: src/share/man/man4/fdc.4,v 1.34 2004/07/15 16:47:31 njl Exp $ .\" -.Dd December 16, 2001 +.Dd July 15, 2004 .Dt FDC 4 .Os .Sh NAME @@ -60,7 +60,8 @@ Floppy disk controllers can connect up to four drives each. The .Nm -driver can currently handle up to two drives per controller. +driver can currently handle up to two drives per controller (or four +drives on ACPI). Upon driver initialization, an attempt is made to find out the type of the floppy controller in use. @@ -153,15 +154,18 @@ .El .Pp On IA32 architectures, the drive type can be specified as 0 for the -first two drives. +drives. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 16 19:30:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E273416A4D0; Fri, 16 Jul 2004 19:30:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDA2F16A4CE for ; Fri, 16 Jul 2004 19:30:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC35843D2D for ; Fri, 16 Jul 2004 19:30:54 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6GJUsGw009364 for ; Fri, 16 Jul 2004 19:30:54 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6GJUsAh009361 for perforce@freebsd.org; Fri, 16 Jul 2004 19:30:54 GMT (envelope-from jhb@freebsd.org) Date: Fri, 16 Jul 2004 19:30:54 GMT Message-Id: <200407161930.i6GJUsAh009361@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 57475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 19:30:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=57475 Change 57475 by jhb@jhb_slimer on 2004/07/16 19:30:25 Hack hack. Try mapping all of the BIOS (0xc0000 - 0xfffff) as read/write to see if that fixes problems people have with PnP BIOS enumeration on Intel motherboards. Affected files ... .. //depot/projects/smpng/sys/i386/i386/locore.s#23 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/locore.s#23 (text+ko) ==== @@ -787,9 +787,24 @@ movl $1,%ecx fillkptphys(%edx) -/* Map read-only from page 1 to the beginning of the kernel text section */ +#define BIOS_START 0xc0000 +#define BIOS_END 0xfffff + +/* Map read-only from page 1 to the beginning of BIOS */ movl $PAGE_SIZE, %eax xorl %edx,%edx + movl $(BIOS_START - PAGE_SIZE)/PAGE_SIZE,%ecx + fillkptphys(%edx) + +/* Map the BIOS read-write for BIOS calls that want to write to it */ + movl $BIOS_START, %eax + movl $PG_RW,%edx + movl $(BIOS_END + 1 - BIOS_START)/PAGE_SIZE,%ecx + fillkptphys(%edx) + +/* Map read-only from the BIOS to the beginning of the kernel text section */ + movl $BIOS_END + 1, %eax + xorl %edx,%edx movl $R(btext),%ecx addl $PAGE_MASK,%ecx subl %eax,%ecx From owner-p4-projects@FreeBSD.ORG Fri Jul 16 20:36:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 322CD16A4D0; Fri, 16 Jul 2004 20:36:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09D4716A4CE for ; Fri, 16 Jul 2004 20:36:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07D1143D46 for ; Fri, 16 Jul 2004 20:36:17 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6GKaG0C011396 for ; Fri, 16 Jul 2004 20:36:16 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6GKaGqR011393 for perforce@freebsd.org; Fri, 16 Jul 2004 20:36:16 GMT (envelope-from wsalamon@computer.org) Date: Fri, 16 Jul 2004 20:36:16 GMT Message-Id: <200407162036.i6GKaGqR011393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 57482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 20:36:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=57482 Change 57482 by wsalamon@wsalamon_epi on 2004/07/16 20:35:43 Integrate the audit and auditd programs into the trustedbsd/audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/PB.project#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/audit.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/audit.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/auditd_control.defs#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/PB.project#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/audit_triggers.defs#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/audit_warn.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd_control.defs#1 branch .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/rc.audit#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jul 16 20:38:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 472F316A4D0; Fri, 16 Jul 2004 20:38:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CEAD16A4CE for ; Fri, 16 Jul 2004 20:38:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 176B743D3F for ; Fri, 16 Jul 2004 20:38:21 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6GKcLbx011460 for ; Fri, 16 Jul 2004 20:38:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6GKcJ91011457 for perforce@freebsd.org; Fri, 16 Jul 2004 20:38:19 GMT (envelope-from jhb@freebsd.org) Date: Fri, 16 Jul 2004 20:38:19 GMT Message-Id: <200407162038.i6GKcJ91011457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 57483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 20:38:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=57483 Change 57483 by jhb@jhb_slimer on 2004/07/16 20:38:04 IFC @57478. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/alpha-gdbstub.c#5 delete .. //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_interface.c#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#8 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#8 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#8 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#29 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#69 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#59 integrate .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#19 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#53 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#37 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#5 integrate .. //depot/projects/smpng/sys/alpha/conf/NOTES#8 integrate .. //depot/projects/smpng/sys/alpha/include/db_machdep.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/smpng/sys/alpha/include/kdb.h#1 branch .. //depot/projects/smpng/sys/alpha/include/pcb.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/ptrace.h#7 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#18 integrate .. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64-gdbstub.c#4 delete .. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#25 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#19 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#18 integrate .. //depot/projects/smpng/sys/amd64/include/db_machdep.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/frame.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/smpng/sys/amd64/include/kdb.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pcb.h#9 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#12 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/smpng/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/smpng/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/smpng/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/smpng/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/smpng/sys/arm/include/frame.h#2 integrate .. //depot/projects/smpng/sys/arm/include/kdb.h#1 branch .. //depot/projects/smpng/sys/arm/include/pcb.h#2 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#2 integrate .. //depot/projects/smpng/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#27 integrate .. //depot/projects/smpng/sys/cam/cam_periph.h#3 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#21 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.h#4 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#9 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#15 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#16 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#16 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#12 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#17 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#16 integrate .. //depot/projects/smpng/sys/conf/NOTES#74 integrate .. //depot/projects/smpng/sys/conf/files#115 integrate .. //depot/projects/smpng/sys/conf/files.alpha#30 integrate .. //depot/projects/smpng/sys/conf/files.amd64#19 integrate .. //depot/projects/smpng/sys/conf/files.i386#64 integrate .. //depot/projects/smpng/sys/conf/files.ia64#42 integrate .. //depot/projects/smpng/sys/conf/files.pc98#61 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#20 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#40 integrate .. //depot/projects/smpng/sys/conf/options#81 integrate .. //depot/projects/smpng/sys/conf/options.alpha#13 integrate .. //depot/projects/smpng/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/smpng/sys/contrib/dev/fla/README#2 delete .. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#11 delete .. //depot/projects/smpng/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/smpng/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/smpng/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#15 integrate .. //depot/projects/smpng/sys/ddb/db_access.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_break.c#7 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#18 integrate .. //depot/projects/smpng/sys/ddb/db_elf.c#7 delete .. //depot/projects/smpng/sys/ddb/db_kld.c#4 delete .. //depot/projects/smpng/sys/ddb/db_main.c#1 branch .. //depot/projects/smpng/sys/ddb/db_output.c#10 integrate .. //depot/projects/smpng/sys/ddb/db_print.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#26 integrate .. //depot/projects/smpng/sys/ddb/db_run.c#7 integrate .. //depot/projects/smpng/sys/ddb/db_sysctl.c#3 delete .. //depot/projects/smpng/sys/ddb/db_thread.c#1 branch .. //depot/projects/smpng/sys/ddb/db_trap.c#3 delete .. //depot/projects/smpng/sys/ddb/db_variables.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_variables.h#3 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#10 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#68 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#44 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#54 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#41 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_mem.c#6 integrate .. //depot/projects/smpng/sys/dev/ct/ct.c#6 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#9 integrate .. //depot/projects/smpng/sys/dev/cy/cy.c#5 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.c#5 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#24 integrate .. //depot/projects/smpng/sys/dev/digi/digi.h#8 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#23 integrate .. //depot/projects/smpng/sys/dev/fb/creator.c#5 integrate .. //depot/projects/smpng/sys/dev/fb/fb.c#11 integrate .. //depot/projects/smpng/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#1 branch .. //depot/projects/smpng/sys/dev/fdc/fdc_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/smpng/sys/dev/fdc/fdcvar.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#34 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/harp/if_harp.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#7 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#9 integrate .. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#9 integrate .. //depot/projects/smpng/sys/dev/led/led.c#9 integrate .. //depot/projects/smpng/sys/dev/md/md.c#51 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#4 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500.c#7 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#22 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp.c#8 integrate .. //depot/projects/smpng/sys/dev/null/null.c#17 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#18 integrate .. //depot/projects/smpng/sys/dev/ofw/openpromio.c#5 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#25 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#13 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#16 integrate .. //depot/projects/smpng/sys/dev/rp/rpvar.h#3 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#20 integrate .. //depot/projects/smpng/sys/dev/si/si.c#15 integrate .. //depot/projects/smpng/sys/dev/si/si.h#3 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#47 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/driver.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/isa/es1888.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#28 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#18 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#5 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#8 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#19 integrate .. //depot/projects/smpng/sys/dev/sx/sx.c#4 integrate .. //depot/projects/smpng/sys/dev/sx/sx.h#3 integrate .. //depot/projects/smpng/sys/dev/syscons/scvidctl.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#40 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#9 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dbg.c#1 branch .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#56 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.c#6 integrate .. //depot/projects/smpng/sys/dev/vinum/vinum.c#18 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumhdr.h#5 integrate .. //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#18 integrate .. //depot/projects/smpng/sys/dev/vinum/vinummemory.c#8 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#17 integrate .. //depot/projects/smpng/sys/doc/Doxyfile#1 branch .. //depot/projects/smpng/sys/doc/Makefile#1 branch .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#13 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc.h#5 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#13 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#21 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#31 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#21 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#9 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#12 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#13 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#18 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#20 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#15 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#17 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#18 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#19 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#16 integrate .. //depot/projects/smpng/sys/gdb/gdb.h#1 branch .. //depot/projects/smpng/sys/gdb/gdb_int.h#1 branch .. //depot/projects/smpng/sys/gdb/gdb_main.c#1 branch .. //depot/projects/smpng/sys/gdb/gdb_packet.c#1 branch .. //depot/projects/smpng/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#3 integrate .. //depot/projects/smpng/sys/geom/label/g_label.h#3 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#8 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#34 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#26 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#51 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#84 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#9 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#25 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/gdb_machdep.c#1 branch .. //depot/projects/smpng/sys/i386/i386/i386-gdbstub.c#7 delete .. //depot/projects/smpng/sys/i386/i386/local_apic.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#76 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#64 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#24 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#70 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#6 integrate .. //depot/projects/smpng/sys/i386/include/db_machdep.h#3 integrate .. //depot/projects/smpng/sys/i386/include/frame.h#5 integrate .. //depot/projects/smpng/sys/i386/include/gdb_machdep.h#1 branch .. //depot/projects/smpng/sys/i386/include/kdb.h#1 branch .. //depot/projects/smpng/sys/i386/include/pcb.h#12 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#36 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#15 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#7 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_kbd.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#12 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#39 integrate .. //depot/projects/smpng/sys/i4b/include/i4b_global.h#4 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#38 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_interface.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/gdb_machdep.c#1 branch .. //depot/projects/smpng/sys/ia64/ia64/ia64-gdbstub.c#3 delete .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#81 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#58 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#65 integrate .. //depot/projects/smpng/sys/ia64/ia64/unwind.c#11 integrate .. //depot/projects/smpng/sys/ia64/include/db_machdep.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/gdb_machdep.h#1 branch .. //depot/projects/smpng/sys/ia64/include/kdb.h#1 branch .. //depot/projects/smpng/sys/ia64/include/md_var.h#15 integrate .. //depot/projects/smpng/sys/ia64/include/pcb.h#10 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#18 integrate .. //depot/projects/smpng/sys/ia64/include/unwind.h#6 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#28 integrate .. //depot/projects/smpng/sys/kern/device_if.m#2 integrate .. //depot/projects/smpng/sys/kern/init_main.c#44 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#72 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#82 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#92 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_syscalls.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#25 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#29 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#34 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#37 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#1 branch .. //depot/projects/smpng/sys/kern/subr_prf.c#36 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#117 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#34 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#38 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#45 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#46 integrate .. //depot/projects/smpng/sys/kern/tty.c#45 integrate .. //depot/projects/smpng/sys/kern/tty_conf.c#6 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#28 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#32 integrate .. //depot/projects/smpng/sys/kern/tty_subr.c#7 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#53 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#56 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#14 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#14 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#18 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#29 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#76 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#76 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#46 integrate .. //depot/projects/smpng/sys/libkern/qsort.c#6 integrate .. //depot/projects/smpng/sys/libkern/qsort_r.c#1 branch .. //depot/projects/smpng/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/fdc/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/firewire/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/firewire/fwip/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/sound/pcm/Makefile#4 delete .. //depot/projects/smpng/sys/modules/sound/sound/Makefile#1 branch .. //depot/projects/smpng/sys/modules/uart/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#6 integrate .. //depot/projects/smpng/sys/net/if_disc.c#15 integrate .. //depot/projects/smpng/sys/net/if_ef.c#16 integrate .. //depot/projects/smpng/sys/net/if_faith.c#23 integrate .. //depot/projects/smpng/sys/net/if_gif.c#23 integrate .. //depot/projects/smpng/sys/net/if_gre.c#19 integrate .. //depot/projects/smpng/sys/net/if_loop.c#31 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#28 integrate .. //depot/projects/smpng/sys/net/if_sl.c#22 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#20 integrate .. //depot/projects/smpng/sys/net/if_stf.c#27 integrate .. //depot/projects/smpng/sys/net/if_tun.c#35 integrate .. //depot/projects/smpng/sys/net/if_var.h#27 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#29 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#14 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#14 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#10 integrate .. //depot/projects/smpng/sys/netatalk/at_rmx.c#3 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#11 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#20 integrate .. //depot/projects/smpng/sys/netatalk/ddp_var.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#24 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_frame_relay.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#11 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#30 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#34 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#57 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#30 integrate .. //depot/projects/smpng/sys/netinet6/ip6_fw.c#16 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#14 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#27 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#38 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#19 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#21 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#44 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#29 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#67 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#26 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#35 integrate .. //depot/projects/smpng/sys/pc98/pc98/fdc_cbus.c#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/fdcvar.h#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#45 integrate .. //depot/projects/smpng/sys/pci/ncr.c#16 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#20 integrate .. //depot/projects/smpng/sys/powerpc/include/cpufunc.h#17 integrate .. //depot/projects/smpng/sys/powerpc/include/db_machdep.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/kdb.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/pcb.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#22 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/locore.S#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#51 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#42 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#37 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#10 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#28 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.h#6 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#27 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.h#6 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#24 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#41 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#7 integrate .. //depot/projects/smpng/sys/sparc64/creator/creator_upa.c#6 integrate .. //depot/projects/smpng/sys/sparc64/include/db_machdep.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/frame.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/gdb_machdep.h#1 branch .. //depot/projects/smpng/sys/sparc64/include/kdb.h#1 branch .. //depot/projects/smpng/sys/sparc64/include/pcb.h#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#33 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_interface.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/gdb_machdep.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#63 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#49 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#57 integrate .. //depot/projects/smpng/sys/sys/conf.h#28 integrate .. //depot/projects/smpng/sys/sys/event.h#12 integrate .. //depot/projects/smpng/sys/sys/eventvar.h#2 integrate .. //depot/projects/smpng/sys/sys/exec.h#6 integrate .. //depot/projects/smpng/sys/sys/kdb.h#1 branch .. //depot/projects/smpng/sys/sys/kse.h#16 integrate .. //depot/projects/smpng/sys/sys/libkern.h#15 integrate .. //depot/projects/smpng/sys/sys/linker.h#13 integrate .. //depot/projects/smpng/sys/sys/module.h#5 integrate .. //depot/projects/smpng/sys/sys/mount.h#30 integrate .. //depot/projects/smpng/sys/sys/param.h#65 integrate .. //depot/projects/smpng/sys/sys/proc.h#119 integrate .. //depot/projects/smpng/sys/sys/procfs.h#4 integrate .. //depot/projects/smpng/sys/sys/ptrace.h#12 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#22 integrate .. //depot/projects/smpng/sys/sys/socket.h#22 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#39 integrate .. //depot/projects/smpng/sys/sys/sx.h#13 integrate .. //depot/projects/smpng/sys/sys/syscall.h#45 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#45 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#47 integrate .. //depot/projects/smpng/sys/sys/systm.h#52 integrate .. //depot/projects/smpng/sys/sys/tty.h#15 integrate .. //depot/projects/smpng/sys/sys/uio.h#19 integrate .. //depot/projects/smpng/sys/sys/user.h#20 integrate .. //depot/projects/smpng/sys/sys/vnode.h#46 integrate .. //depot/projects/smpng/sys/tools/makeobjops.awk#5 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#33 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#10 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#55 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#29 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#16 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#63 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#53 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#48 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#6 (text+ko) ==== @@ -25,10 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $"); - -#include "opt_ddb.h" -#include "opt_dev_sc.h" +__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.11 2004/07/10 22:29:40 marcel Exp $"); #include #include @@ -49,18 +46,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void api_up1000_init(void); static void api_up1000_cons_init(void); @@ -85,40 +70,15 @@ irongate_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#6 (text+ko) ==== @@ -46,7 +46,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.9 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.10 2004/07/10 23:47:18 marcel Exp $"); #include #include @@ -813,26 +813,9 @@ * (optional) alternate format. Return address of start of * next instruction. */ -int alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t); -db_addr_t -db_disasm(loc, altfmt) - db_addr_t loc; - boolean_t altfmt; -{ - alpha_instruction inst; - - inst.bits = db_get_value(loc, 4, 0); - - loc += alpha_print_instruction(loc, inst, altfmt); - return (loc); -} - -int -alpha_print_instruction(iadr, i, showregs) - db_addr_t iadr; - alpha_instruction i; - boolean_t showregs; +static int +alpha_print_instr(db_addr_t iadr, alpha_instruction i, boolean_t showregs) { const char *opcode; int ireg; @@ -1038,7 +1021,7 @@ if (i.mem_format.opcode == op_ldah) signed_immediate <<= 16; db_printf(" <0x%lx>", signed_immediate + - db_register_value(DDB_REGS, i.mem_format.rs)); + db_register_value(i.mem_format.rs)); } break; case op_br: @@ -1084,10 +1067,23 @@ db_printf(","); db_printf("%s=0x%lx", name_of_register[regnum[ireg]], - db_register_value(DDB_REGS, regnum[ireg])); + db_register_value(regnum[ireg])); } db_printf(">"); } db_printf("\n"); return (sizeof(alpha_instruction)); } + +db_addr_t +db_disasm(loc, altfmt) + db_addr_t loc; + boolean_t altfmt; +{ + alpha_instruction inst; + + inst.bits = db_get_value(loc, 4, 0); + + loc += alpha_print_instr(loc, inst, altfmt); + return (loc); +} ==== //depot/projects/smpng/sys/alpha/alpha/db_interface.c#10 (text+ko) ==== @@ -47,17 +47,15 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.28 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.29 2004/07/10 23:47:18 marcel Exp $"); #include -#include -#include #include +#include +#include #include -#include -#include -#include #include +#include #include #include @@ -73,209 +71,104 @@ #include #include #include -#include -static jmp_buf *db_nofault = 0; -extern jmp_buf db_jmpbuf; +static db_varfcn_t db_frame; -extern void gdb_handle_exception(db_regs_t *, int, int); - -#if 0 -extern char *trap_type[]; -extern int trap_types; -#endif - -int db_active; - -void ddbprinttrap(unsigned long, unsigned long, unsigned long, - unsigned long); - struct db_variable db_regs[] = { - { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL }, - { "t0", &ddb_regs.tf_regs[FRAME_T0], FCN_NULL }, - { "t1", &ddb_regs.tf_regs[FRAME_T1], FCN_NULL }, - { "t2", &ddb_regs.tf_regs[FRAME_T2], FCN_NULL }, - { "t3", &ddb_regs.tf_regs[FRAME_T3], FCN_NULL }, - { "t4", &ddb_regs.tf_regs[FRAME_T4], FCN_NULL }, - { "t5", &ddb_regs.tf_regs[FRAME_T5], FCN_NULL }, - { "t6", &ddb_regs.tf_regs[FRAME_T6], FCN_NULL }, - { "t7", &ddb_regs.tf_regs[FRAME_T7], FCN_NULL }, - { "s0", &ddb_regs.tf_regs[FRAME_S0], FCN_NULL }, - { "s1", &ddb_regs.tf_regs[FRAME_S1], FCN_NULL }, - { "s2", &ddb_regs.tf_regs[FRAME_S2], FCN_NULL }, - { "s3", &ddb_regs.tf_regs[FRAME_S3], FCN_NULL }, - { "s4", &ddb_regs.tf_regs[FRAME_S4], FCN_NULL }, - { "s5", &ddb_regs.tf_regs[FRAME_S5], FCN_NULL }, - { "s6", &ddb_regs.tf_regs[FRAME_S6], FCN_NULL }, - { "a0", &ddb_regs.tf_regs[FRAME_A0], FCN_NULL }, - { "a1", &ddb_regs.tf_regs[FRAME_A1], FCN_NULL }, - { "a2", &ddb_regs.tf_regs[FRAME_A2], FCN_NULL }, - { "a3", &ddb_regs.tf_regs[FRAME_A3], FCN_NULL }, - { "a4", &ddb_regs.tf_regs[FRAME_A4], FCN_NULL }, - { "a5", &ddb_regs.tf_regs[FRAME_A5], FCN_NULL }, - { "t8", &ddb_regs.tf_regs[FRAME_T8], FCN_NULL }, - { "t9", &ddb_regs.tf_regs[FRAME_T9], FCN_NULL }, - { "t10", &ddb_regs.tf_regs[FRAME_T10], FCN_NULL }, - { "t11", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL }, - { "ra", &ddb_regs.tf_regs[FRAME_RA], FCN_NULL }, - { "t12", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL }, - { "at", &ddb_regs.tf_regs[FRAME_AT], FCN_NULL }, - { "gp", &ddb_regs.tf_regs[FRAME_GP], FCN_NULL }, - { "sp", &ddb_regs.tf_regs[FRAME_SP], FCN_NULL }, - { "pc", &ddb_regs.tf_regs[FRAME_PC], FCN_NULL }, - { "ps", &ddb_regs.tf_regs[FRAME_PS], FCN_NULL }, - { "ai", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL }, - { "pv", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL }, + { "v0", (db_expr_t *)FRAME_V0, db_frame }, + { "t0", (db_expr_t *)FRAME_T0, db_frame }, + { "t1", (db_expr_t *)FRAME_T1, db_frame }, + { "t2", (db_expr_t *)FRAME_T2, db_frame }, + { "t3", (db_expr_t *)FRAME_T3, db_frame }, + { "t4", (db_expr_t *)FRAME_T4, db_frame }, + { "t5", (db_expr_t *)FRAME_T5, db_frame }, + { "t6", (db_expr_t *)FRAME_T6, db_frame }, + { "t7", (db_expr_t *)FRAME_T7, db_frame }, + { "s0", (db_expr_t *)FRAME_S0, db_frame }, + { "s1", (db_expr_t *)FRAME_S1, db_frame }, + { "s2", (db_expr_t *)FRAME_S2, db_frame }, + { "s3", (db_expr_t *)FRAME_S3, db_frame }, + { "s4", (db_expr_t *)FRAME_S4, db_frame }, + { "s5", (db_expr_t *)FRAME_S5, db_frame }, + { "s6", (db_expr_t *)FRAME_S6, db_frame }, + { "a0", (db_expr_t *)FRAME_A0, db_frame }, + { "a1", (db_expr_t *)FRAME_A1, db_frame }, + { "a2", (db_expr_t *)FRAME_A2, db_frame }, + { "a3", (db_expr_t *)FRAME_A3, db_frame }, + { "a4", (db_expr_t *)FRAME_A4, db_frame }, + { "a5", (db_expr_t *)FRAME_A5, db_frame }, + { "t8", (db_expr_t *)FRAME_T8, db_frame }, + { "t9", (db_expr_t *)FRAME_T9, db_frame }, + { "t10", (db_expr_t *)FRAME_T10, db_frame }, + { "t11", (db_expr_t *)FRAME_T11, db_frame }, + { "ra", (db_expr_t *)FRAME_RA, db_frame }, + { "t12", (db_expr_t *)FRAME_T12, db_frame }, + { "at", (db_expr_t *)FRAME_AT, db_frame }, + { "gp", (db_expr_t *)FRAME_GP, db_frame }, + { "sp", (db_expr_t *)FRAME_SP, db_frame }, + { "pc", (db_expr_t *)FRAME_PC, db_frame }, + { "ps", (db_expr_t *)FRAME_PS, db_frame }, + { "ai", (db_expr_t *)FRAME_T11, db_frame }, + { "pv", (db_expr_t *)FRAME_T12, db_frame }, }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); -/* - * Print trap reason. - */ -void -ddbprinttrap(a0, a1, a2, entry) - unsigned long a0, a1, a2, entry; +static int +db_frame(struct db_variable *vp, db_expr_t *valuep, int op) { - /* XXX Implement. */ - - printf("ddbprinttrap(0x%lx, 0x%lx, 0x%lx, 0x%lx)\n", a0, a1, a2, - entry); + if (kdb_frame == NULL) + return (0); + if (op == DB_VAR_GET) + *valuep = kdb_frame->tf_regs[(uintptr_t)vp->valuep]; + else + kdb_frame->tf_regs[(uintptr_t)vp->valuep] = *valuep; + return (1); } /* - * ddb_trap - field a kernel trap + * Read bytes from kernel address space for debugger. */ int -kdb_trap(a0, a1, a2, entry, regs) - unsigned long a0, a1, a2, entry; - db_regs_t *regs; +db_read_bytes(vm_offset_t addr, size_t size, char *data) { - int ddb_mode = !(boothowto & RB_GDB); - register_t s; + jmp_buf jb; + void *prev_jb; + char *src; + int ret; - /* - * Don't bother checking for usermode, since a benign entry - * by the kernel (call to Debugger() or a breakpoint) has - * already checked for usermode. If neither of those - * conditions exist, something Bad has happened. - */ - - if (entry != ALPHA_KENTRY_IF || - (a0 != ALPHA_IF_CODE_BUGCHK && a0 != ALPHA_IF_CODE_BPT - && a0 != ALPHA_IF_CODE_GENTRAP)) { -#if 0 - if (ddb_mode) { - db_printf("ddbprinttrap from 0x%lx\n", /* XXX */ - regs->tf_regs[FRAME_PC]); - ddbprinttrap(a0, a1, a2, entry); - /* - * Tell caller "We did NOT handle the trap." - * Caller should panic, or whatever. - */ - return (0); - } -#endif - if (db_nofault) { - jmp_buf *no_fault = db_nofault; - db_nofault = 0; - longjmp(*no_fault, 1); - } + prev_jb = kdb_jmpbuf(jb); + ret = setjmp(jb); + if (ret == 0) { + src = (char *)addr; + while (size-- > 0) + *data++ = *src++; } - - /* - * XXX Should switch to DDB's own stack, here. - */ - - ddb_regs = *regs; - - s = intr_disable(); - -#ifdef SMP -#ifdef DIAGNOSTIC - db_printf("stopping %x\n", PCPU_GET(other_cpus)); -#endif - stop_cpus(PCPU_GET(other_cpus)); -#ifdef DIAGNOSTIC - db_printf("stopped_cpus=%x\n", stopped_cpus); -#endif -#endif - - db_active++; - - if (ddb_mode) { - cndbctl(TRUE); /* DDB active, unblank video */ - db_trap(entry, a0); /* Where the work happens */ - cndbctl(FALSE); /* DDB inactive */ - } else - gdb_handle_exception(&ddb_regs, entry, a0); - - db_active--; - -#ifdef SMP - restart_cpus(stopped_cpus); -#endif - - intr_restore(s); - - *regs = ddb_regs; - - /* - * Tell caller "We HAVE handled the trap." - */ - return (1); + (void)kdb_jmpbuf(prev_jb); + return (ret); } /* - * Read bytes from kernel address space for debugger. - */ -void -db_read_bytes(addr, size, data) - vm_offset_t addr; - register size_t size; - register char *data; -{ - register char *src; - - db_nofault = &db_jmpbuf; - - src = (char *)addr; - while (size-- > 0) - *data++ = *src++; - - db_nofault = 0; -} - -/* * Write bytes to kernel address space for debugger. */ -void -db_write_bytes(addr, size, data) - vm_offset_t addr; - register size_t size; - register char *data; +int +db_write_bytes(vm_offset_t addr, size_t size, char *data) { - register char *dst; + jmp_buf jb; + void *prev_jb; + char *dst; + int ret; - db_nofault = &db_jmpbuf; - - dst = (char *)addr; - while (size-- > 0) - *dst++ = *data++; - alpha_pal_imb(); - - db_nofault = 0; -} - -void -Debugger(const char* msg) -{ - u_int saveintr; - - printf("%s\n", msg); - saveintr = alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH); - __asm("call_pal 0x81"); /* XXX bugchk */ - alpha_pal_swpipl(saveintr); + prev_jb = kdb_jmpbuf(jb); + ret = setjmp(jb); + if (ret == 0) { + dst = (char *)addr; + while (size-- > 0) + *dst++ = *data++; + alpha_pal_imb(); + } + (void)kdb_jmpbuf(prev_jb); + return (ret); } /* @@ -338,9 +231,7 @@ }; u_long -db_register_value(regs, regno) - db_regs_t *regs; - int regno; +db_register_value(int regno) { if (regno > 31 || regno < 0) { @@ -351,7 +242,7 @@ if (regno == 31) return (0); - return (regs->tf_regs[reg_to_frame[regno]]); + return (kdb_frame->tf_regs[reg_to_frame[regno]]); } /* @@ -446,19 +337,6 @@ return (FALSE); } -#if 0 -boolean_t -db_inst_spill(ins, regn) - int ins, regn; -{ - alpha_instruction insn; - - insn.bits = ins; - return ((insn.mem_format.opcode == op_stq) && - (insn.mem_format.rd == regn)); -} -#endif - boolean_t db_inst_load(ins) int ins; @@ -520,10 +398,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 16 20:58:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DEEC16A4D0; Fri, 16 Jul 2004 20:58:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1908F16A4CE for ; Fri, 16 Jul 2004 20:58:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02DCB43D2D for ; Fri, 16 Jul 2004 20:58:51 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6GKwo6J012117 for ; Fri, 16 Jul 2004 20:58:50 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6GKwohG012114 for perforce@freebsd.org; Fri, 16 Jul 2004 20:58:50 GMT (envelope-from wsalamon@computer.org) Date: Fri, 16 Jul 2004 20:58:50 GMT Message-Id: <200407162058.i6GKwohG012114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 57489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 20:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=57489 Change 57489 by wsalamon@wsalamon_epi on 2004/07/16 20:57:52 Remove files that are not needed. Start fixing up the Makefiles. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile#2 edit .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile.postamble#2 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/PB.project#2 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/audit.c#2 edit .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/auditd_control.defs#2 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#2 edit .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile.postamble#2 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/PB.project#2 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/audit_triggers.defs#2 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd_control.defs#2 delete Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile#2 (text+ko) ==== @@ -1,50 +1,11 @@ -# -# Generated by the Apple Project Builder. +# +# Makefile for the audit command. # -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# NAME = audit -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - CFILES = audit.c -OTHERSRCS = Makefile.preamble Makefile Makefile.postamble\ - auditd_control.defs audit.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/sbin -WINDOWS_INSTALLDIR = /Library/Executables -PDO_UNIX_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - -HEADER_PATHS = -I../auditd.tproj - - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(JDKBINDIR)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +install-man-page: + install -d $(DSTROOT)/usr/share/man/man1 + install -c -m 444 audit.1 $(DSTROOT)/usr/share/man/man1/audit.1 ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/audit.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#2 (text+ko) ==== @@ -1,52 +1,11 @@ -# -# Generated by the Apple Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. +# +# Makefile for the audit command. # -NAME = auditd +NAME = audit -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool +CFILES = auditd.c audit_warn.c auditd.h -HFILES = auditd.h - -CFILES = audit_warn.c auditd.c - -OTHERSRCS = Makefile.preamble Makefile Makefile.postamble\ - audit_triggers.defs auditd_control.defs auditd.8 rc.audit - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/sbin -WINDOWS_INSTALLDIR = /Library/Executables -PDO_UNIX_INSTALLDIR = /usr/sbin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - -NEXTSTEP_PB_LDFLAGS = -lbsm - - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(JDKBINDIR)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +install-man-page: + install -d $(DSTROOT)/usr/share/man/man1 + install -c -m 444 auditd.8 $(DSTROOT)/usr/share/man/man1/auditd.8 From owner-p4-projects@FreeBSD.ORG Fri Jul 16 21:12:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90CD716A4D0; Fri, 16 Jul 2004 21:12:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39B5A16A4CE for ; Fri, 16 Jul 2004 21:12:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32ED143D2F for ; Fri, 16 Jul 2004 21:12:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6GLC9lg012715 for ; Fri, 16 Jul 2004 21:12:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6GLC8jM012712 for perforce@freebsd.org; Fri, 16 Jul 2004 21:12:08 GMT (envelope-from peter@freebsd.org) Date: Fri, 16 Jul 2004 21:12:08 GMT Message-Id: <200407162112.i6GLC8jM012712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 21:12:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=57492 Change 57492 by peter@peter_overcee on 2004/07/16 21:11:27 IFC @57490 Affected files ... .. //depot/projects/hammer/Makefile#20 integrate .. //depot/projects/hammer/UPDATING#46 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#1 branch .. //depot/projects/hammer/include/Makefile#26 integrate .. //depot/projects/hammer/include/proc_service.h#1 branch .. //depot/projects/hammer/include/wchar.h#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#15 integrate .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#12 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetln.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetwln.3#1 branch .. //depot/projects/hammer/lib/libc/stdio/fgetwln.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/local.h#12 integrate .. //depot/projects/hammer/lib/libc/sys/getfsstat.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#5 integrate .. //depot/projects/hammer/lib/libthread_db/Makefile#1 branch .. //depot/projects/hammer/lib/libthread_db/include/thread_db.h#1 branch .. //depot/projects/hammer/lib/libthread_db/include/thread_db_int.h#1 branch .. //depot/projects/hammer/lib/libthread_db/pthread/Makefile#1 branch .. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db.c#1 branch .. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db.h#1 branch .. //depot/projects/hammer/lib/libthread_db/pthread/pthread_db_i386.c#1 branch .. //depot/projects/hammer/lib/libthread_db/src/Makefile#1 branch .. //depot/projects/hammer/lib/libthread_db/src/thread_db.c#1 branch .. //depot/projects/hammer/lib/msun/src/math.h#20 integrate .. //depot/projects/hammer/release/Makefile#49 integrate .. //depot/projects/hammer/release/alpha/mkisoimages.sh#4 integrate .. //depot/projects/hammer/release/amd64/mkisoimages.sh#5 integrate .. //depot/projects/hammer/release/i386/mkisoimages.sh#5 integrate .. //depot/projects/hammer/release/ia64/mkisoimages.sh#5 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#19 integrate .. //depot/projects/hammer/release/sparc64/mkisoimages.sh#6 integrate .. //depot/projects/hammer/share/examples/Makefile#5 integrate .. //depot/projects/hammer/share/examples/kld/cdev/module/cdev.c#3 integrate .. //depot/projects/hammer/share/examples/kld/cdev/module/cdevmod.c#3 integrate .. //depot/projects/hammer/share/examples/worm/README#2 delete .. //depot/projects/hammer/share/examples/worm/makecdfs.sh#2 delete .. //depot/projects/hammer/share/man/man4/fdc.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_biba.4#5 integrate .. //depot/projects/hammer/share/man/man4/mac_mls.4#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#31 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#10 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#9 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#93 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/hammer/sys/cam/cam_periph.h#3 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/hammer/sys/coda/coda_fbsd.c#10 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#13 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#54 integrate .. //depot/projects/hammer/sys/conf/files#72 integrate .. //depot/projects/hammer/sys/conf/files.amd64#51 integrate .. //depot/projects/hammer/sys/conf/files.i386#37 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#43 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#14 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#13 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_mem.c#5 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#14 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#11 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#8 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#16 integrate .. //depot/projects/hammer/sys/dev/fb/fb.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/splashreg.h#2 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#9 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_acpi.c#1 branch .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#28 integrate .. //depot/projects/hammer/sys/dev/harp/if_harp.c#5 integrate .. //depot/projects/hammer/sys/dev/hfa/hfa_freebsd.c#5 integrate .. //depot/projects/hammer/sys/dev/ispfw/ispfw.c#6 integrate .. //depot/projects/hammer/sys/dev/md/md.c#33 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#15 integrate .. //depot/projects/hammer/sys/dev/null/null.c#12 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#14 integrate .. //depot/projects/hammer/sys/dev/ofw/openpromio.c#5 integrate .. //depot/projects/hammer/sys/dev/random/randomdev.c#17 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#13 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#14 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#18 integrate .. //depot/projects/hammer/sys/dev/si/si.c#13 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#39 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/driver.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/isa/es1888.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ess.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/isa/gusc.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csa.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/neomagic.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#12 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#5 integrate .. //depot/projects/hammer/sys/dev/streams/streams.c#9 integrate .. //depot/projects/hammer/sys/dev/sx/sx.c#9 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#21 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#16 integrate .. //depot/projects/hammer/sys/dev/utopia/utopia.c#6 integrate .. //depot/projects/hammer/sys/dev/vinum/vinum.c#12 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#13 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#11 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#6 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#45 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#11 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#11 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#8 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#17 integrate .. //depot/projects/hammer/sys/i4b/include/i4b_global.h#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#30 integrate .. //depot/projects/hammer/sys/ia64/ia64/ssc.c#8 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#13 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#58 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#22 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#39 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#23 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#11 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#23 integrate .. //depot/projects/hammer/sys/kern/tty.c#22 integrate .. //depot/projects/hammer/sys/kern/tty_conf.c#7 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#19 integrate .. //depot/projects/hammer/sys/kern/tty_subr.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#33 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#46 integrate .. //depot/projects/hammer/sys/libkern/qsort.c#5 integrate .. //depot/projects/hammer/sys/libkern/qsort_r.c#1 branch .. //depot/projects/hammer/sys/modules/fdc/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/sound/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sound/pcm/Makefile#3 delete .. //depot/projects/hammer/sys/modules/sound/sound/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_disc.c#12 integrate .. //depot/projects/hammer/sys/net/if_ef.c#10 integrate .. //depot/projects/hammer/sys/net/if_faith.c#15 integrate .. //depot/projects/hammer/sys/net/if_gif.c#16 integrate .. //depot/projects/hammer/sys/net/if_gre.c#18 integrate .. //depot/projects/hammer/sys/net/if_loop.c#20 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#15 integrate .. //depot/projects/hammer/sys/net/if_sl.c#15 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#15 integrate .. //depot/projects/hammer/sys/net/if_stf.c#15 integrate .. //depot/projects/hammer/sys/net/if_tun.c#19 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#18 integrate .. //depot/projects/hammer/sys/net/ppp_tty.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#22 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#32 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#19 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#17 integrate .. //depot/projects/hammer/sys/netinet6/ip6_fw.c#9 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#12 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#20 integrate .. //depot/projects/hammer/sys/pc98/pc98/fdc_cbus.c#2 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#28 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#25 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.c#8 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#26 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.h#5 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#26 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.h#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#26 integrate .. //depot/projects/hammer/sys/sys/exec.h#5 integrate .. //depot/projects/hammer/sys/sys/libkern.h#8 integrate .. //depot/projects/hammer/sys/sys/proc.h#58 integrate .. //depot/projects/hammer/sys/sys/procfs.h#3 integrate .. //depot/projects/hammer/sys/sys/resourcevar.h#10 integrate .. //depot/projects/hammer/sys/sys/socket.h#13 integrate .. //depot/projects/hammer/sys/sys/systm.h#21 integrate .. //depot/projects/hammer/sys/sys/tty.h#14 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#39 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#29 integrate .. //depot/projects/hammer/usr.bin/basename/basename.c#3 integrate .. //depot/projects/hammer/usr.bin/checknr/checknr.c#3 integrate .. //depot/projects/hammer/usr.bin/col/col.1#3 integrate .. //depot/projects/hammer/usr.bin/colcrt/colcrt.1#3 integrate .. //depot/projects/hammer/usr.bin/colcrt/colcrt.c#3 integrate .. //depot/projects/hammer/usr.bin/colrm/colrm.1#2 integrate .. //depot/projects/hammer/usr.bin/column/column.1#2 integrate .. //depot/projects/hammer/usr.bin/column/column.c#2 integrate .. //depot/projects/hammer/usr.bin/du/du.c#8 integrate .. //depot/projects/hammer/usr.bin/fmt/fmt.c#2 integrate .. //depot/projects/hammer/usr.bin/hexdump/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/hexdump/conv.c#4 integrate .. //depot/projects/hammer/usr.bin/jot/jot.c#3 integrate .. //depot/projects/hammer/usr.bin/killall/killall.c#9 integrate .. //depot/projects/hammer/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.c#4 integrate .. //depot/projects/hammer/usr.bin/rev/rev.c#3 integrate .. //depot/projects/hammer/usr.bin/rs/rs.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#16 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#9 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#3 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#9 integrate .. //depot/projects/hammer/usr.bin/ul/ul.1#4 integrate .. //depot/projects/hammer/usr.bin/whereis/whereis.c#3 integrate .. //depot/projects/hammer/usr.bin/xstr/xstr.c#4 integrate .. //depot/projects/hammer/usr.sbin/amd/include/config.h#4 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#8 integrate .. //depot/projects/hammer/usr.sbin/ppp/command.c#6 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#5 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#5 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd_lock.c#6 integrate .. //depot/projects/hammer/usr.sbin/usbd/usbd.conf.5#3 integrate Differences ... ==== //depot/projects/hammer/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.300 2004/07/09 13:55:50 phk Exp $ +# $FreeBSD: src/Makefile,v 1.301 2004/07/16 02:51:28 marcel Exp $ # # The user-driven targets are: # @@ -144,14 +144,17 @@ # Set a reasonable default .MAIN: all +.if defined(DESTDIR) .if make(world) STARTTIME!= LC_ALL=C date .endif # # world # -# Attempt to rebuild and reinstall *everything*, with reasonable chance of -# success, regardless of how old your existing system is. +# Attempt to rebuild and reinstall everything. This target is not to be +# used for upgrading an existing FreeBSD system, because the kernel is +# not included. One can argue that this target doesn't build everything +# then. # world: upgrade_checks @echo "--------------------------------------------------------------" @@ -178,6 +181,17 @@ @echo ">>> make world completed on `LC_ALL=C date`" @echo " (started ${STARTTIME})" @echo "--------------------------------------------------------------" +.else +world: + @echo "WARNING: make world will overwrite your existing FreeBSD" + @echo "installation without also building and installing a new" + @echo "kernel. This can be dangerous. Please read the handbook," + @echo "'Using make world', for how to upgrade your system." + @echo "Define DESTDIR to the where you want to install FreeBSD, + @echo "including /, to override this warning and proceed as usual." + @echo "Bailing out now..." + @false +.endif # # kernel ==== //depot/projects/hammer/UPDATING#46 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20040716: + The sound device drivers are renamed. `sound' is always required, + while `snd_*' should be configured accordingly to your hardware. + Refer to NOTES for the detail of the drivers. + 20040710: __FreeBSD_version bumped to 502122. @@ -1714,4 +1719,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.325 2004/07/11 13:26:44 simon Exp $ +$FreeBSD: src/UPDATING,v 1.326 2004/07/16 04:04:29 tanimura Exp $ ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.2 2004/07/16 05:03:41 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.1 2004/06/25 06:48:54 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/hammer/include/Makefile#26 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.216 2004/07/05 23:13:16 das Exp $ +# $FreeBSD: src/include/Makefile,v 1.217 2004/07/15 03:43:18 davidxu Exp $ # # Doing a "make install" builds /usr/include. @@ -12,7 +12,7 @@ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \ netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \ - pthread.h \ + proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \ stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ ==== //depot/projects/hammer/include/wchar.h#15 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.41 2004/06/07 10:31:10 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.42 2004/07/16 06:06:09 tjr Exp $ */ /*- @@ -208,6 +208,7 @@ #endif #if __BSD_VISIBLE +wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict); size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif ==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.30 2004/07/10 18:10:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.31 2004/07/15 03:13:27 kientzle Exp $"); #include #include @@ -72,7 +72,7 @@ struct extract { mode_t umask; mode_t default_dir_mode; - struct archive_string mkdirpath; + struct archive_string create_parent_dir; struct fixup_entry *fixup_list; struct fixup_entry *current_fixup; @@ -110,9 +110,11 @@ static int extract_symlink(struct archive *, struct archive_entry *, int); static gid_t lookup_gid(struct archive *, const char *uname, gid_t); static uid_t lookup_uid(struct archive *, const char *uname, uid_t); -static int mkdirpath(struct archive *, const char *, int flags); -static int mkdirpath_internal(struct archive *, char *, int flags); -static int mkdirpath_recursive(struct archive *, char *, int flags); +static int create_parent_dir(struct archive *, const char *, int flags); +static int create_parent_dir_internal(struct archive *, char *, + int flags); +static int create_parent_dir_recursive(struct archive *, char *, + int flags); static int restore_metadata(struct archive *, struct archive_entry *, int flags); #ifdef HAVE_POSIX_ACL @@ -275,7 +277,7 @@ p = next; } extract->fixup_list = NULL; - archive_string_free(&extract->mkdirpath); + archive_string_free(&extract->create_parent_dir); free(a->extract); a->extract = NULL; } @@ -409,7 +411,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (fd < 0) { - mkdirpath(a, name, flags); + create_parent_dir(a, name, flags); fd = open(name, O_WRONLY | O_CREAT | O_EXCL, mode); } if (fd < 0) { @@ -434,8 +436,9 @@ extract->pst = NULL; /* Invalidate cached stat data. */ /* Copy path to mutable storage. */ - archive_strcpy(&(extract->mkdirpath), archive_entry_pathname(entry)); - path = extract->mkdirpath.s; + archive_strcpy(&(extract->create_parent_dir), + archive_entry_pathname(entry)); + path = extract->create_parent_dir.s; /* Deal with any troublesome trailing path elements. */ for (;;) { @@ -477,7 +480,7 @@ unlink(path); } else { /* Doesn't already exist; try building the parent path. */ - if (mkdirpath_internal(a, path, flags) != ARCHIVE_OK) + if (create_parent_dir_internal(a, path, flags) != ARCHIVE_OK) return (ARCHIVE_WARN); } @@ -512,24 +515,26 @@ * path into mutable storage first. */ static int -mkdirpath(struct archive *a, const char *path, int flags) +create_parent_dir(struct archive *a, const char *path, int flags) { struct extract *extract; + int r; extract = a->extract; /* Copy path to mutable storage. */ - archive_strcpy(&(extract->mkdirpath), path); + archive_strcpy(&(extract->create_parent_dir), path); - return (mkdirpath_internal(a, extract->mkdirpath.s, flags)); + r = create_parent_dir_internal(a, extract->create_parent_dir.s, flags); + return (r); } /* - * Handle remaining setup for mkdirpath_recursive(), assuming + * Handle remaining setup for create_parent_dir_recursive(), assuming * path is already in mutable storage. */ static int -mkdirpath_internal(struct archive *a, char *path, int flags) +create_parent_dir_internal(struct archive *a, char *path, int flags) { char *slash; mode_t old_umask; @@ -541,7 +546,7 @@ return (ARCHIVE_OK); *slash = '\0'; old_umask = umask(~SECURE_DIR_MODE); - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); umask(old_umask); *slash = '/'; return (r); @@ -554,7 +559,7 @@ * Otherwise, returns ARCHIVE_WARN. */ static int -mkdirpath_recursive(struct archive *a, char *path, int flags) +create_parent_dir_recursive(struct archive *a, char *path, int flags) { struct stat st; struct extract *extract; @@ -579,7 +584,7 @@ /* Don't bother trying to create null path, '.', or '..'. */ if (slash != NULL) { *slash = '\0'; - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); *slash = '/'; return (r); } @@ -611,7 +616,7 @@ return (ARCHIVE_WARN); } else if (slash != NULL) { *slash = '\0'; - r = mkdirpath_recursive(a, path, flags); + r = create_parent_dir_recursive(a, path, flags); *slash = '/'; if (r != ARCHIVE_OK) return (r); @@ -658,7 +663,7 @@ if (r != 0) { /* Might be a non-existent parent dir; try fixing that. */ - mkdirpath(a, pathname, flags); + create_parent_dir(a, pathname, flags); r = link(linkname, pathname); } @@ -695,7 +700,7 @@ if (r != 0) { /* Might be a non-existent parent dir; try fixing that. */ - mkdirpath(a, pathname, flags); + create_parent_dir(a, pathname, flags); r = symlink(linkname, pathname); } @@ -728,7 +733,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (r != 0 && errno == ENOENT) { - mkdirpath(a, archive_entry_pathname(entry), flags); + create_parent_dir(a, archive_entry_pathname(entry), flags); r = mknod(archive_entry_pathname(entry), mode, archive_entry_rdev(entry)); } @@ -777,7 +782,7 @@ /* Might be a non-existent parent dir; try fixing that. */ if (r != 0 && errno == ENOENT) { - mkdirpath(a, archive_entry_pathname(entry), flags); + create_parent_dir(a, archive_entry_pathname(entry), flags); r = mkfifo(archive_entry_pathname(entry), archive_entry_mode(entry)); } ==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#12 (text+ko) ==== @@ -1,11 +1,12 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.32 2003/01/10 06:22:28 tjr Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.33 2004/07/16 06:06:09 tjr Exp $ # stdio sources .PATH: ${.CURDIR}/stdio SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ - fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ + fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetwln.c \ + fgetws.c \ fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \ fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \ ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \ @@ -22,7 +23,8 @@ vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \ wsetup.c -MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 flockfile.3 \ +MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ + flockfile.3 \ fopen.3 fputs.3 \ fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \ printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \ ==== //depot/projects/hammer/lib/libc/stdio/fgetln.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fgetln.3 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.7 2001/10/01 16:08:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.8 2004/07/16 06:07:12 tjr Exp $ .\" .Dd April 19, 1994 .Dt FGETLN 3 @@ -118,6 +118,7 @@ .Sh SEE ALSO .Xr ferror 3 , .Xr fgets 3 , +.Xr fgetwln 3 , .Xr fopen 3 , .Xr putc 3 .Sh HISTORY ==== //depot/projects/hammer/lib/libc/stdio/fgetln.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fgetln.c 8.2 (Berkeley) 1/2/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.9 2004/03/10 09:28:38 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.10 2004/07/16 05:52:51 tjr Exp $"); #include "namespace.h" #include @@ -55,8 +55,8 @@ * so we add 1 here. #endif */ -static int -slbexpand(FILE *fp, size_t newsize) +int +__slbexpand(FILE *fp, size_t newsize) { void *p; @@ -132,7 +132,7 @@ * file buffer to line buffer, refill file and look for * newline. The loop stops only when we find a newline. */ - if (slbexpand(fp, len + OPTIMISTIC)) + if (__slbexpand(fp, len + OPTIMISTIC)) goto error; (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p, len - off); @@ -146,7 +146,7 @@ p++; diff = p - fp->_p; len += diff; - if (slbexpand(fp, len)) + if (__slbexpand(fp, len)) goto error; (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p, diff); ==== //depot/projects/hammer/lib/libc/stdio/local.h#12 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.25 2004/06/08 05:45:32 das Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.26 2004/07/16 05:52:51 tjr Exp $ */ #include /* for off_t */ @@ -57,6 +57,7 @@ extern wint_t __fputwc(wchar_t, FILE *); extern int __sflush(FILE *); extern FILE *__sfp(void); +extern int __slbexpand(FILE *, size_t); extern int __srefill(FILE *); extern int __sread(void *, char *, int); extern int __swrite(void *, char const *, int); ==== //depot/projects/hammer/lib/libc/sys/getfsstat.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsstat.2 8.3 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.16 2003/11/21 01:30:28 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.17 2004/07/16 01:18:13 alfred Exp $ .\" .Dd November 20, 2003 .Dt GETFSSTAT 2 @@ -63,8 +63,13 @@ The buffer is filled with an array of .Fa fsstat structures, one for each mounted file system -up to the size specified by +up to the byte count specified by .Fa bufsize . +Note, the +.Fa bufsize +argument is the number of bytes that +.Fa buf +can hold, not the count of statfs structures it will hold. .Pp If .Fa buf ==== //depot/projects/hammer/lib/libc/sys/recv.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)recv.2 8.3 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.20 2003/12/24 18:52:41 alfred Exp $ +.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.21 2004/07/16 17:15:37 harti Exp $ .\" .Dd February 21, 1994 .Dt RECV 2 @@ -124,10 +124,11 @@ function is formed by .Em or Ap ing one or more of the values: -.Bl -column MSG_WAITALL -offset indent +.Bl -column MSG_DONTWAIT -offset indent .It Dv MSG_OOB Ta process out-of-band data .It Dv MSG_PEEK Ta peek at incoming message .It Dv MSG_WAITALL Ta wait for full request or error +.It Dv MSG_DONTWAIT Ta don't block .El .Pp The @@ -145,6 +146,12 @@ However, the call may still return less data than requested if a signal is caught, an error or disconnect occurs, or the next data to be received is of a different type than that returned. +The MSG_DONTWAIT flag requests the call to return when it would block otherwise. +If no data is available +.Va errno +is set to +.Er EAGAIN . +This flag is not available in strict ANSI or C99 compilation mode. .Pp The .Fn recvmsg ==== //depot/projects/hammer/lib/msun/src/math.h#20 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.40 2004/07/09 03:32:39 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.41 2004/07/16 06:21:56 das Exp $ */ #ifndef _MATH_H_ @@ -34,11 +34,11 @@ float __uf; } __nan; -#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__INTEL_COMPILER) +#if (defined(__GNUC__) && ((__GNUC__ >= 3 && __GNUC_MINOR__ >= 3) || __GNUC__ >= 4)) || defined(__INTEL_COMPILER) #define __MATH_BUILTIN_CONSTANTS #endif -#if (defined(__GNUC__) && __GNUC__ >= 3) +#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER)) #define __MATH_BUILTIN_RELOPS #endif ==== //depot/projects/hammer/release/Makefile#49 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.845 2004/06/10 19:33:26 brian Exp $ +# $FreeBSD: src/release/Makefile,v 1.846 2004/07/15 04:52:57 jhb Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -314,6 +314,18 @@ @echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!" @exit 1 .endif +.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) +.for p in ${LOCAL_PATCHES} +.if !exists(${p}) + @echo "The patch file ${p} does not exist!" + @exit 1 +.endif +.endfor +.endif +.if defined(LOCAL_SCRIPT) && !exists(${LOCAL_SCRIPT}) + @echo "The local script ${LOCAL_SCRIPT} does not exist!" + @exit 1 +.endif .if make(release) .if exists(${CHROOTDIR}) # The first command will fail on a handful of files that have their schg @@ -347,12 +359,10 @@ .endif .if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) .for p in ${LOCAL_PATCHES} -.if exists(${p}) patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p} -.endif .endfor .endif -.if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) +.if defined(LOCAL_SCRIPT) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} \ RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} .endif ==== //depot/projects/hammer/release/alpha/mkisoimages.sh#4 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/alpha/mkisoimages.sh,v 1.10 2004/07/15 09:28:02 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" + if [ "x$1" = "x-b" ]; then bootable="yes" shift @@ -50,7 +52,7 @@ LABEL=$1; shift NAME=$1; shift -mkisofs -r -J -V $LABEL -o $NAME $* +mkisofs -r -J -V $LABEL -P "$publisher" -o $NAME $* type setcdboot 2>&1 | grep " is " >/dev/null if [ $? -ne 0 ]; then ==== //depot/projects/hammer/release/amd64/mkisoimages.sh#5 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.9 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.10 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" if [ "x$1" = "x-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-b boot/cdboot -no-emul-boot" @@ -53,4 +54,4 @@ LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -J -V $LABEL -o $NAME $* +mkisofs $bootable -r -J -V $LABEL -P "$publisher" -o $NAME $* ==== //depot/projects/hammer/release/i386/mkisoimages.sh#5 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.10 2004/07/12 07:59:24 kris Exp $ +# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +publisher="The FreeBSD Project. http://www.freebsd.org/" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 16 21:13:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B78716A4D0; Fri, 16 Jul 2004 21:13:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2266B16A4CE for ; Fri, 16 Jul 2004 21:13:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C95D43D1F for ; Fri, 16 Jul 2004 21:13:11 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6GLDAIm012747 for ; Fri, 16 Jul 2004 21:13:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6GLDAgh012744 for perforce@freebsd.org; Fri, 16 Jul 2004 21:13:10 GMT (envelope-from jhb@freebsd.org) Date: Fri, 16 Jul 2004 21:13:10 GMT Message-Id: <200407162113.i6GLDAgh012744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 57493 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 21:13:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=57493 Change 57493 by jhb@jhb_slimer on 2004/07/16 21:12:15 IFC @57490. Loop back TDF -> TDP fixes. Affected files ... .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#93 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#61 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#30 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#35 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#26 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#67 integrate .. //depot/projects/smpng/sys/sys/proc.h#120 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#20 integrate Differences ... ==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.17 2004/03/21 01:22:24 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.18 2004/07/16 20:53:00 obrien Exp $"); #include "opt_compat.h" @@ -150,7 +150,7 @@ NULL, "/usr/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, - "/usr/libexec/ld-elf32.so.1", + "/libexec/ld-elf32.so.1", }; SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/smpng/sys/kern/kern_kse.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.184 2004/07/13 07:33:40 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.185 2004/07/16 21:04:55 jhb Exp $"); #include #include @@ -838,8 +838,9 @@ return (0); if (user) { /* Current always do via ast() */ + td->td_pflags |= TDP_USTATCLOCK; mtx_lock_spin(&sched_lock); - td->td_flags |= (TDF_USTATCLOCK|TDF_ASTPENDING); + td->td_flags |= TDF_ASTPENDING; mtx_unlock_spin(&sched_lock); td->td_uuticks++; } else if (td->td_mailbox != NULL) @@ -1129,11 +1130,9 @@ * is returning from interrupt, charge thread's * userland time for UTS. */ - if (td->td_flags & TDF_USTATCLOCK) { + if (td->td_pflags & TDP_USTATCLOCK) { thread_update_usr_ticks(td, 1); - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_USTATCLOCK; - mtx_unlock_spin(&sched_lock); + td->td_pflags &= ~TDP_USTATCLOCK; } /* ==== //depot/projects/smpng/sys/kern/kern_sig.c#93 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.284 2004/07/13 07:20:10 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.285 2004/07/16 21:00:50 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -219,9 +219,7 @@ mtx_unlock_spin(&sched_lock); } if ((p->p_flag & P_SA) && !(p->p_flag & P_SIGEVENT)) { - if (SIGSETEQ(saved, p->p_siglist)) - return; - else { + if (!SIGSETEQ(saved, p->p_siglist)) { /* pending set changed */ p->p_flag |= P_SIGEVENT; wakeup(&p->p_siglist); @@ -1647,9 +1645,7 @@ saved = p->p_siglist; do_tdsignal(td, sig, target); if ((p->p_flag & P_SA) && !(p->p_flag & P_SIGEVENT)) { - if (SIGSETEQ(saved, p->p_siglist)) - return; - else { + if (!SIGSETEQ(saved, p->p_siglist)) { /* pending set changed */ p->p_flag |= P_SIGEVENT; wakeup(&p->p_siglist); ==== //depot/projects/smpng/sys/kern/kern_switch.c#39 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.70 2004/07/10 21:36:01 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.71 2004/07/16 21:04:55 jhb Exp $"); #include "opt_full_preemption.h" @@ -451,7 +451,8 @@ ("critical_exit: td_critnest == 0")); if (td->td_critnest == 1) { #ifdef PREEMPTION - if (td->td_flags & TDF_OWEPREEMPT) { + mtx_assert(&sched_lock, MA_NOTOWNED); + if (td->td_pflags & TDP_OWEPREEMPT) { mtx_lock_spin(&sched_lock); mi_switch(SW_INVOL, NULL); mtx_unlock_spin(&sched_lock); @@ -485,7 +486,9 @@ * The new thread should not preempt the current thread if any of the * following conditions are true: * - * - The current thread has a higher (numerically lower) priority. + * - The current thread has a higher (numerically lower) or + * equivalent priority. Note that this prevents curthread from + * trying to preempt to itself. * - It is too early in the boot for context switches (cold is set). * - The current thread has an inhibitor set or is in the process of * exiting. In this case, the current thread is about to switch @@ -515,7 +518,7 @@ if (ctd->td_critnest > 1) { CTR1(KTR_PROC, "maybe_preempt: in critical section %d", ctd->td_critnest); - ctd->td_flags |= TDF_OWEPREEMPT; + ctd->td_pflags |= TDP_OWEPREEMPT; return (0); } ==== //depot/projects/smpng/sys/kern/kern_synch.c#74 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.253 2004/07/10 21:36:01 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.254 2004/07/16 21:04:55 jhb Exp $"); #include "opt_ktrace.h" @@ -297,11 +297,12 @@ mtx_assert(&Giant, MA_NOTOWNED); #endif KASSERT(td->td_critnest == 1 || (td->td_critnest == 2 && - (td->td_flags & TDF_OWEPREEMPT) != 0 && (flags & SW_INVOL) != 0 && + (td->td_pflags & TDP_OWEPREEMPT) != 0 && (flags & SW_INVOL) != 0 && newtd == NULL), ("mi_switch: switch in a critical section")); KASSERT((flags & (SW_INVOL | SW_VOL)) != 0, ("mi_switch: switch must be voluntary or involuntary")); + KASSERT(newtd != curthread, ("mi_switch: preempting back to ourself")); if (flags & SW_VOL) p->p_stats->p_ru.ru_nvcsw++; ==== //depot/projects/smpng/sys/kern/kern_thread.c#61 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.187 2004/07/13 07:20:09 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.188 2004/07/16 21:01:52 jhb Exp $"); #include #include @@ -1066,7 +1066,7 @@ mtx_assert(&sched_lock, MA_OWNED); PROC_LOCK_ASSERT(p, MA_OWNED); if (!P_SHOULDSTOP(p)) { - while (( td = TAILQ_FIRST(&p->p_suspended))) { + while ((td = TAILQ_FIRST(&p->p_suspended))) { thread_unsuspend_one(td); } } else if ((P_SHOULDSTOP(p) == P_STOPPED_SINGLE) && ==== //depot/projects/smpng/sys/kern/sched_4bsd.c#30 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.44 2004/07/13 20:49:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.45 2004/07/16 21:04:55 jhb Exp $"); #include #include @@ -654,7 +654,8 @@ sched_tdcnt++; td->td_lastcpu = td->td_oncpu; td->td_last_kse = ke; - td->td_flags &= ~(TDF_NEEDRESCHED | TDF_OWEPREEMPT); + td->td_flags &= ~TDF_NEEDRESCHED; + td->td_pflags &= ~TDP_OWEPREEMPT; td->td_oncpu = NOCPU; /* * At the last moment, if this thread is still marked RUNNING, ==== //depot/projects/smpng/sys/kern/sched_ule.c#35 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.115 2004/07/10 21:38:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.116 2004/07/16 21:04:55 jhb Exp $"); #include #include @@ -1138,7 +1138,8 @@ td->td_last_kse = ke; td->td_lastcpu = td->td_oncpu; td->td_oncpu = NOCPU; - td->td_flags &= ~(TDF_NEEDRESCHED | TDF_OWEPREEMPT); + td->td_flags &= ~TDF_NEEDRESCHED; + td->td_pflags &= ~TDP_OWEPREEMPT; /* * If the KSE has been assigned it may be in the process of switching ==== //depot/projects/smpng/sys/kern/subr_prof.c#26 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_prof.c,v 1.73 2004/07/02 03:50:47 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_prof.c,v 1.74 2004/07/16 21:04:55 jhb Exp $"); #include #include @@ -481,10 +481,11 @@ addr = prof->pr_base + i; mtx_unlock_spin(&sched_lock); if ((v = fuswintr(addr)) == -1 || suswintr(addr, v + ticks) == -1) { - prof->pr_addr = pc; - prof->pr_ticks = ticks; + td->td_profil_addr = pc; + td->td_profil_ticks = ticks; + td->td_pflags |= TDP_OWEUPC; mtx_lock_spin(&sched_lock); - td->td_flags |= TDF_OWEUPC | TDF_ASTPENDING; + td->td_flags |= TDF_ASTPENDING; mtx_unlock_spin(&sched_lock); } } ==== //depot/projects/smpng/sys/kern/subr_trap.c#67 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.268 2004/07/02 19:09:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.269 2004/07/16 21:04:55 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -178,7 +178,7 @@ p->p_sflag &= ~PS_MACPEND; #endif td->td_flags &= ~(TDF_ASTPENDING | TDF_NEEDSIGCHK | - TDF_NEEDRESCHED | TDF_OWEUPC | TDF_INTERRUPT); + TDF_NEEDRESCHED | TDF_INTERRUPT); cnt.v_soft++; mtx_unlock_spin(&sched_lock); /* @@ -191,10 +191,10 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (flags & TDF_OWEUPC && p->p_flag & P_PROFIL) { - addupc_task(td, p->p_stats->p_prof.pr_addr, - p->p_stats->p_prof.pr_ticks); - p->p_stats->p_prof.pr_ticks = 0; + if (td->td_pflags & TDP_OWEUPC && p->p_flag & P_PROFIL) { + addupc_task(td, td->td_profil_addr, td->td_profil_ticks); + td->td_profil_ticks = 0; + td->td_pflags &= ~TDP_OWEUPC; } if (sflag & PS_ALRMPEND) { PROC_LOCK(p); ==== //depot/projects/smpng/sys/sys/proc.h#120 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.386 2004/07/13 07:20:09 davidxu Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.387 2004/07/16 21:04:55 jhb Exp $ */ #ifndef _SYS_PROC_H_ @@ -304,6 +304,9 @@ stack_t td_sigstk; /* (k) Stack ptr and on-stack flag. */ int td_kflags; /* (c) Flags for KSE threading. */ int td_xsig; /* (c) Signal for ptrace */ + u_long td_profil_addr; /* (k) Temporary addr until AST. */ + u_int td_profil_ticks; /* (k) Temporary ticks until AST. */ + #define td_endzero td_base_pri /* Copied during fork1() or thread_sched_upcall(). */ @@ -346,12 +349,9 @@ #define TDF_IDLETD 0x000020 /* This is one of the per-CPU idle threads. */ #define TDF_SELECT 0x000040 /* Selecting; wakeup/waiting danger. */ #define TDF_TSNOBLOCK 0x000100 /* Don't block on a turnstile due to race. */ -#define TDF_OWEPREEMPT 0x000200 /* Thread has a pending preemption. */ #define TDF_ASTPENDING 0x000800 /* Thread has some asynchronous events. */ #define TDF_TIMOFAIL 0x001000 /* Timeout from sleep after we were awake. */ #define TDF_INTERRUPT 0x002000 /* Thread is marked as interrupted. */ -#define TDF_USTATCLOCK 0x004000 /* Finish user statclock hit at next AST. */ -#define TDF_OWEUPC 0x008000 /* Owe thread an addupc() call at next AST. */ #define TDF_NEEDRESCHED 0x010000 /* Thread needs to yield. */ #define TDF_NEEDSIGCHK 0x020000 /* Thread may need signal delivery. */ #define TDF_XSIG 0x040000 /* Thread is exchanging signal under traced */ @@ -368,6 +368,9 @@ #define TDP_ALTSTACK 0x0020 /* Have alternate signal stack. */ #define TDP_DEADLKTREAT 0x0040 /* Lock aquisition - deadlock treatment. */ #define TDP_SA 0x0080 /* A scheduler activation based thread. */ +#define TDP_OWEPREEMPT 0x0100 /* Thread has a pending preemption. */ +#define TDP_OWEUPC 0x0200 /* Owe thread an addupc() call at next AST. */ +#define TDP_USTATCLOCK 0x0400 /* Finish user statclock hit at next AST. */ #define TDI_SUSPENDED 0x0001 /* On suspension queue. */ #define TDI_SLEEPING 0x0002 /* Actually asleep! (tricky). */ ==== //depot/projects/smpng/sys/sys/resourcevar.h#20 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)resourcevar.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/resourcevar.h,v 1.42 2004/07/02 03:50:48 jhb Exp $ + * $FreeBSD: src/sys/sys/resourcevar.h,v 1.43 2004/07/16 21:04:55 jhb Exp $ */ #ifndef _SYS_RESOURCEVAR_H_ @@ -63,8 +63,6 @@ u_long pr_size; /* (c + j) Buffer size. */ u_long pr_off; /* (c + j) PC offset. */ u_long pr_scale; /* (c + j) PC scaling. */ - u_long pr_addr; /* (k) Temporary addr until AST. */ - u_int pr_ticks; /* (k) Temporary ticks until AST. */ } p_prof; #define pstat_endcopy p_start struct timeval p_start; /* (b) Starting time. */ From owner-p4-projects@FreeBSD.ORG Fri Jul 16 23:19:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 076E516A4D0; Fri, 16 Jul 2004 23:19:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7C6F16A4CE for ; Fri, 16 Jul 2004 23:19:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB61D43D2D for ; Fri, 16 Jul 2004 23:19:48 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6GNJmQ5016568 for ; Fri, 16 Jul 2004 23:19:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6GNJmLa016565 for perforce@freebsd.org; Fri, 16 Jul 2004 23:19:48 GMT (envelope-from peter@freebsd.org) Date: Fri, 16 Jul 2004 23:19:48 GMT Message-Id: <200407162319.i6GNJmLa016565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 57504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 23:19:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=57504 Change 57504 by peter@peter_overcee on 2004/07/16 23:19:16 add in jhb's hack to try and solve preemption lockups. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#23 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#23 (text+ko) ==== @@ -204,6 +204,8 @@ } isrc->is_pic->pic_eoi_source(isrc); error = 0; + /* XXX */ + td->td_pflags &= ~ TDP_OWEPREEMPT; critical_exit(); } else { /* From owner-p4-projects@FreeBSD.ORG Sat Jul 17 02:55:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1E6416A4D0; Sat, 17 Jul 2004 02:55:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D2B416A4CE for ; Sat, 17 Jul 2004 02:55:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7183C43D39 for ; Sat, 17 Jul 2004 02:55:11 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6H2tBnl022164 for ; Sat, 17 Jul 2004 02:55:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6H2tA0T022161 for perforce@freebsd.org; Sat, 17 Jul 2004 02:55:10 GMT (envelope-from marcel@freebsd.org) Date: Sat, 17 Jul 2004 02:55:10 GMT Message-Id: <200407170255.i6H2tA0T022161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 57511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jul 2004 02:55:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=57511 Change 57511 by marcel@marcel_nfs on 2004/07/17 02:55:03 IFC @57508 Affected files ... .. //depot/projects/gdb/MAINTAINERS#12 integrate .. //depot/projects/gdb/Makefile#7 integrate .. //depot/projects/gdb/UPDATING#22 integrate .. //depot/projects/gdb/bin/date/date.1#6 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/config.h#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/config.h#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/config.h#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/config.h#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/config.h#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/gdb/include/wchar.h#4 integrate .. //depot/projects/gdb/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/fgetln.c#3 integrate .. //depot/projects/gdb/lib/libc/stdio/fgetwln.3#1 branch .. //depot/projects/gdb/lib/libc/stdio/fgetwln.c#1 branch .. //depot/projects/gdb/lib/libc/stdio/local.h#5 integrate .. //depot/projects/gdb/lib/libc/sys/recv.2#2 integrate .. //depot/projects/gdb/lib/msun/src/math.h#11 integrate .. //depot/projects/gdb/share/examples/kld/cdev/module/cdev.c#3 integrate .. //depot/projects/gdb/share/examples/kld/cdev/module/cdevmod.c#2 integrate .. //depot/projects/gdb/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/gdb/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#14 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/gdb/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/gdb/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/gdb/sys/conf/NOTES#34 integrate .. //depot/projects/gdb/sys/conf/files#42 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#10 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cmbat.c#8 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc_isa.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/gdb/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/isa/gusc.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/gdb/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/gdb/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/isa/sbc.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/gdb/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/pci/ds1.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/gdb/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/gdb/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/neomagic.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/pci/via82c686.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/gdb/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#12 integrate .. //depot/projects/gdb/sys/ia64/include/pmap.h#6 integrate .. //depot/projects/gdb/sys/isa/psm.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_kse.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_prot.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_sig.c#13 integrate .. //depot/projects/gdb/sys/kern/kern_switch.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_synch.c#15 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#21 integrate .. //depot/projects/gdb/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#19 integrate .. //depot/projects/gdb/sys/kern/subr_prof.c#7 integrate .. //depot/projects/gdb/sys/kern/subr_trap.c#7 integrate .. //depot/projects/gdb/sys/modules/fdc/Makefile#6 integrate .. //depot/projects/gdb/sys/modules/sound/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/sound/pcm/Makefile#2 delete .. //depot/projects/gdb/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/gdb/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/gdb/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/gdb/sys/security/mac_biba/mac_biba.h#3 integrate .. //depot/projects/gdb/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/gdb/sys/security/mac_mls/mac_mls.h#3 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#13 integrate .. //depot/projects/gdb/sys/sys/proc.h#22 integrate .. //depot/projects/gdb/sys/sys/resourcevar.h#5 integrate .. //depot/projects/gdb/sys/sys/socket.h#7 integrate .. //depot/projects/gdb/sys/sys/systm.h#10 integrate .. //depot/projects/gdb/usr.bin/hexdump/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/conv.c#3 integrate .. //depot/projects/gdb/usr.bin/jot/jot.c#2 integrate .. //depot/projects/gdb/usr.bin/rev/rev.c#2 integrate .. //depot/projects/gdb/usr.bin/ul/ul.1#3 integrate .. //depot/projects/gdb/usr.sbin/burncd/burncd.8#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/command.c#3 integrate .. //depot/projects/gdb/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/log.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/log.h#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/ppp.8.m4#5 integrate .. //depot/projects/gdb/usr.sbin/ppp/radius.c#5 integrate .. //depot/projects/gdb/usr.sbin/ppp/radius.h#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.lockd/lock_proc.c#3 integrate .. //depot/projects/gdb/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.lockd/lockd_lock.c#4 integrate Differences ... ==== //depot/projects/gdb/MAINTAINERS#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.92 2004/07/02 19:40:36 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.93 2004/07/16 21:47:43 alfred Exp $ subsystem login notes ----------------------------- @@ -97,7 +97,9 @@ geom_nop pjd Pre-commit review requested. geom_stripe pjd Pre-commit review requested. sbin/geom pjd Pre-commit review requested. - +nfs alfred Pre-commit review requested. +rpc.lockd alfred Pre-commit review requested. +rpc alfred Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/gdb/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.300 2004/07/09 13:55:50 phk Exp $ +# $FreeBSD: src/Makefile,v 1.301 2004/07/16 02:51:28 marcel Exp $ # # The user-driven targets are: # @@ -144,14 +144,17 @@ # Set a reasonable default .MAIN: all +.if defined(DESTDIR) .if make(world) STARTTIME!= LC_ALL=C date .endif # # world # -# Attempt to rebuild and reinstall *everything*, with reasonable chance of -# success, regardless of how old your existing system is. +# Attempt to rebuild and reinstall everything. This target is not to be +# used for upgrading an existing FreeBSD system, because the kernel is +# not included. One can argue that this target doesn't build everything +# then. # world: upgrade_checks @echo "--------------------------------------------------------------" @@ -178,6 +181,17 @@ @echo ">>> make world completed on `LC_ALL=C date`" @echo " (started ${STARTTIME})" @echo "--------------------------------------------------------------" +.else +world: + @echo "WARNING: make world will overwrite your existing FreeBSD" + @echo "installation without also building and installing a new" + @echo "kernel. This can be dangerous. Please read the handbook," + @echo "'Using make world', for how to upgrade your system." + @echo "Define DESTDIR to the where you want to install FreeBSD, + @echo "including /, to override this warning and proceed as usual." + @echo "Bailing out now..." + @false +.endif # # kernel ==== //depot/projects/gdb/UPDATING#22 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20040716: + The sound device drivers are renamed. `sound' is always required, + while `snd_*' should be configured accordingly to your hardware. + Refer to NOTES for the detail of the drivers. + 20040710: __FreeBSD_version bumped to 502122. @@ -1714,4 +1719,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.325 2004/07/11 13:26:44 simon Exp $ +$FreeBSD: src/UPDATING,v 1.326 2004/07/16 04:04:29 tanimura Exp $ ==== //depot/projects/gdb/bin/date/date.1#6 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.66 2004/07/03 00:03:25 ru Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.67 2004/07/17 00:26:31 alfred Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -328,6 +328,14 @@ sets the time to .Li "2:32 PM" , without modifying the date. +.Pp +Finally the command: +.Pp +.Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`date`"" ""+%s""" +.Pp +can be used to parse the ouput from +.Nm +and express it in epoch time. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/config.h,v 1.2 2004/07/16 05:03:41 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.1 2004/06/25 06:48:53 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.1 2004/06/25 06:48:54 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.2 2004/07/16 05:03:42 marcel Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ ==== //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.1 2004/07/15 04:51:04 davidxu Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.2 2004/07/16 06:11:48 davidxu Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -1078,13 +1078,17 @@ ps_err_e ps_lstop(struct ps_prochandle *ph, lwpid_t lwpid) { - return (ptrace (lwpid, PT_SUSPEND, 0, 0) == 0); + if (ptrace (PT_SUSPEND, lwpid, 0, 0) == -1) + return PS_ERR; + return PS_OK; } ps_err_e ps_lcontinue(struct ps_prochandle *ph, lwpid_t lwpid) { - return (ptrace (lwpid, PT_RESUME, 0, 0) == 0); + if (ptrace (PT_RESUME, lwpid, 0, 0) == -1) + return PS_ERR; + return PS_OK; } pid_t ==== //depot/projects/gdb/include/wchar.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.41 2004/06/07 10:31:10 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.42 2004/07/16 06:06:09 tjr Exp $ */ /*- @@ -208,6 +208,7 @@ #endif #if __BSD_VISIBLE +wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict); size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif ==== //depot/projects/gdb/lib/libc/stdio/Makefile.inc#2 (text+ko) ==== @@ -1,11 +1,12 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.32 2003/01/10 06:22:28 tjr Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.33 2004/07/16 06:06:09 tjr Exp $ # stdio sources .PATH: ${.CURDIR}/stdio SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ - fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ + fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetwln.c \ + fgetws.c \ fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \ fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \ ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \ @@ -22,7 +23,8 @@ vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \ wsetup.c -MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 flockfile.3 \ +MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ + flockfile.3 \ fopen.3 fputs.3 \ fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \ printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \ ==== //depot/projects/gdb/lib/libc/stdio/fgetln.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fgetln.3 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.7 2001/10/01 16:08:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.8 2004/07/16 06:07:12 tjr Exp $ .\" .Dd April 19, 1994 .Dt FGETLN 3 @@ -118,6 +118,7 @@ .Sh SEE ALSO .Xr ferror 3 , .Xr fgets 3 , +.Xr fgetwln 3 , .Xr fopen 3 , .Xr putc 3 .Sh HISTORY ==== //depot/projects/gdb/lib/libc/stdio/fgetln.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fgetln.c 8.2 (Berkeley) 1/2/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.9 2004/03/10 09:28:38 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.10 2004/07/16 05:52:51 tjr Exp $"); #include "namespace.h" #include @@ -55,8 +55,8 @@ * so we add 1 here. #endif */ -static int -slbexpand(FILE *fp, size_t newsize) +int +__slbexpand(FILE *fp, size_t newsize) { void *p; @@ -132,7 +132,7 @@ * file buffer to line buffer, refill file and look for * newline. The loop stops only when we find a newline. */ - if (slbexpand(fp, len + OPTIMISTIC)) + if (__slbexpand(fp, len + OPTIMISTIC)) goto error; (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p, len - off); @@ -146,7 +146,7 @@ p++; diff = p - fp->_p; len += diff; - if (slbexpand(fp, len)) + if (__slbexpand(fp, len)) goto error; (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p, diff); ==== //depot/projects/gdb/lib/libc/stdio/local.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.25 2004/06/08 05:45:32 das Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.26 2004/07/16 05:52:51 tjr Exp $ */ #include /* for off_t */ @@ -57,6 +57,7 @@ extern wint_t __fputwc(wchar_t, FILE *); extern int __sflush(FILE *); extern FILE *__sfp(void); +extern int __slbexpand(FILE *, size_t); extern int __srefill(FILE *); extern int __sread(void *, char *, int); extern int __swrite(void *, char const *, int); ==== //depot/projects/gdb/lib/libc/sys/recv.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)recv.2 8.3 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.20 2003/12/24 18:52:41 alfred Exp $ +.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.21 2004/07/16 17:15:37 harti Exp $ .\" .Dd February 21, 1994 .Dt RECV 2 @@ -124,10 +124,11 @@ function is formed by .Em or Ap ing one or more of the values: -.Bl -column MSG_WAITALL -offset indent +.Bl -column MSG_DONTWAIT -offset indent .It Dv MSG_OOB Ta process out-of-band data .It Dv MSG_PEEK Ta peek at incoming message .It Dv MSG_WAITALL Ta wait for full request or error +.It Dv MSG_DONTWAIT Ta don't block .El .Pp The @@ -145,6 +146,12 @@ However, the call may still return less data than requested if a signal is caught, an error or disconnect occurs, or the next data to be received is of a different type than that returned. +The MSG_DONTWAIT flag requests the call to return when it would block otherwise. +If no data is available +.Va errno +is set to +.Er EAGAIN . +This flag is not available in strict ANSI or C99 compilation mode. .Pp The .Fn recvmsg ==== //depot/projects/gdb/lib/msun/src/math.h#11 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.40 2004/07/09 03:32:39 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.41 2004/07/16 06:21:56 das Exp $ */ #ifndef _MATH_H_ @@ -34,11 +34,11 @@ float __uf; } __nan; -#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__INTEL_COMPILER) +#if (defined(__GNUC__) && ((__GNUC__ >= 3 && __GNUC_MINOR__ >= 3) || __GNUC__ >= 4)) || defined(__INTEL_COMPILER) #define __MATH_BUILTIN_CONSTANTS #endif -#if (defined(__GNUC__) && __GNUC__ >= 3) +#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER)) #define __MATH_BUILTIN_RELOPS #endif ==== //depot/projects/gdb/share/examples/kld/cdev/module/cdev.c#3 (text+ko) ==== @@ -65,7 +65,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/share/examples/kld/cdev/module/cdev.c,v 1.7 2004/06/09 17:10:41 maxim Exp $ + * $FreeBSD: src/share/examples/kld/cdev/module/cdev.c,v 1.8 2004/07/16 06:55:34 tjr Exp $ */ #include #include @@ -95,10 +95,10 @@ /* Stores string recv'd by _write() */ static char buf[512+1]; -static int len; +static size_t len; int -mydev_open(dev_t dev, int flag, int otyp, struct thread *td) +mydev_open(struct cdev *dev, int flag, int otyp, struct thread *td) { struct proc *procp = td->td_proc; @@ -110,7 +110,7 @@ } int -mydev_close(dev_t dev, int flag, int otyp, struct thread *td) +mydev_close(struct cdev *dev, int flag, int otyp, struct thread *td) { struct proc *procp = td->td_proc; @@ -120,7 +120,8 @@ } int -mydev_ioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct thread *td) +mydev_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int mode, + struct thread *td) { int error = 0; struct proc *procp = td->td_proc; @@ -145,7 +146,7 @@ * to buf for later accessing. */ int -mydev_write(dev_t dev, struct uio *uio, int ioflag) +mydev_write(struct cdev *dev, struct uio *uio, int ioflag) { int err = 0; @@ -165,7 +166,7 @@ * accessing. */ int -mydev_read(dev_t dev, struct uio *uio, int ioflag) +mydev_read(struct cdev *dev, struct uio *uio, int ioflag) { int err = 0; ==== //depot/projects/gdb/share/examples/kld/cdev/module/cdevmod.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/share/examples/kld/cdev/module/cdevmod.c,v 1.5 2003/08/03 10:39:28 mbr Exp $ + * $FreeBSD: src/share/examples/kld/cdev/module/cdevmod.c,v 1.6 2004/07/16 06:55:34 tjr Exp $ */ #include #include @@ -82,6 +82,7 @@ #endif static struct cdevsw my_devsw = { + /* version */ .d_version = D_VERSION, /* open */ .d_open = mydev_open, /* close */ .d_close = mydev_close, /* read */ .d_read = mydev_read, @@ -96,7 +97,7 @@ * in devfs... we must keep this variable sane until we * call kldunload. */ -static dev_t sdev; +static struct cdev *sdev; /* * This function is called each time the module is loaded or unloaded. ==== //depot/projects/gdb/share/man/man4/mac_biba.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2002-2004 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris Costello @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_biba.4,v 1.16 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_biba.4,v 1.17 2004/07/16 02:04:41 rwatson Exp $ .\" .Dd November 18, 2002 .Os @@ -141,7 +141,7 @@ Multi-Level Security (MLS) protects the confidentiality, rather than the integrity, of subjects and objects. .Ss Label Format -Almost all system objects are tagged with a single, active label element, +Almost all system objects are tagged with a effective, active label element, reflecting the integrity of the object, or integrity of the data contained in the object. In general, objects labels are represented in the following form: @@ -157,7 +157,7 @@ biba/low .Ed .Pp -Subject labels consist of three label elements: a single (active) label, +Subject labels consist of three label elements: a effective (active) label, as well as a range of available labels. This range is represented using two ordered Biba label elements, and when set on a process, permits the process to change its active label to any label of @@ -166,7 +166,7 @@ In general, subject labels are represented in the following form: .Pp .Sm off -.D1 Li biba / Ar singlegrade : singlecompartments ( lograde : locompartments - +.D1 Li biba / Ar effectivegrade : effectivecompartments ( lograde : locompartments - .D1 Ar higrade : hicompartments ) .Sm on .Pp @@ -179,10 +179,10 @@ Valid ranged labels must meet the following requirement regarding their elements: .Pp -.D1 Ar rangehigh No \[>=] Ar single No \[>=] Ar rangelow +.D1 Ar rangehigh No \[>=] Ar effective No \[>=] Ar rangelow .Pp One class of objects with ranges currently exists, the network interface. -In the case of the network interface, the single label element references the +In the case of the network interface, the effective label element references the default label for packets received over the interface, and the range represents the range of acceptable labels of packets to be transmitted over the interface. ==== //depot/projects/gdb/share/man/man4/mac_mls.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2002-2004 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris Costello @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.17 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.18 2004/07/16 02:04:41 rwatson Exp $ .\" .Dd December 1, 2002 .Os @@ -134,7 +134,7 @@ .Xr ( mac_biba 4 ) in order to protect the Trusted Code Base (TCB). .Ss Label Format -Almost all system objects are tagged with a single, active label element, +Almost all system objects are tagged with a effective, active label element, reflecting the classification of the object, or classification of the data contained in the object. In general, object labels are represented in the following form: @@ -149,7 +149,7 @@ mls/low .Ed .Pp -Subject labels consist of three label elements: a single (active) label, +Subject labels consist of three label elements: a effective (active) label, as well as a range of available labels. This range is represented using two ordered MLS label elements, and when set on a process, permits the process to change its active label to any label of @@ -158,7 +158,7 @@ In general, subject labels are represented in the following form: .Pp .Sm off -.D1 Li mls / Ar singlegrade : singlecompartments ( lograde : locompartments No - +.D1 Li mls / Ar effectivegrade : effectivecompartments ( lograde : locompartments No - .D1 Ar higrade : hicompartments ) .Sm on .Pp @@ -171,10 +171,10 @@ Valid ranged labels must meet the following requirement regarding their elements: .Pp -.D1 Ar rangehigh No \[>=] Ar single No \[>=] Ar rangelow +.D1 Ar rangehigh No \[>=] Ar effective No \[>=] Ar rangelow .Pp One class of objects with ranges currently exists, the network interface. -In the case of the network interface, the single label element references +In the case of the network interface, the effective label element references the default label for packets received over the interface, and the range represents the range of acceptable labels of packets to be transmitted over the interface. ==== //depot/projects/gdb/sys/alpha/alpha/pmap.c#14 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.158 2004/07/15 18:00:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.159 2004/07/16 21:38:48 alc Exp $"); #include #include @@ -551,8 +551,6 @@ cputype = hwrpb->rpb_type; return (cputype == ST_DEC_21000 || ST_DEC_4100); - - return 0; } /* @@ -1441,9 +1439,7 @@ { pv_entry_t pv; int rtval; - int s; - s = splvm(); if (m->md.pv_list_count < pmap->pm_stats.resident_count) { TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pmap == pv->pv_pmap && va == pv->pv_va) @@ -1468,7 +1464,6 @@ free_pv_entry(pv); } - splx(s); return rtval; } @@ -1479,11 +1474,8 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m) { - - int s; pv_entry_t pv; - s = splvm(); pv = get_pv_entry(); pv->pv_va = va; pv->pv_pmap = pmap; @@ -1494,7 +1486,6 @@ TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; vm_page_unlock_queues(); - splx(s); } /* @@ -1524,8 +1515,6 @@ } else { return pmap_unuse_pt(pmap, va, NULL); } - - return 0; } /* @@ -1550,8 +1539,6 @@ */ (void) pmap_remove_pte(pmap, ptq, va); pmap_invalidate_page(pmap, va); - - return; } /* @@ -1624,7 +1611,6 @@ { register pv_entry_t pv; pt_entry_t *pte, tpte; - int s; #if defined(PMAP_DIAGNOSTIC) /* @@ -1636,7 +1622,6 @@ } #endif - s = splvm(); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); @@ -1673,8 +1658,6 @@ } vm_page_flag_clear(m, PG_WRITEABLE); - - splx(s); } /* @@ -2164,26 +2147,21 @@ { pv_entry_t pv; int loops = 0; - int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) return FALSE; - s = splvm(); - /* * Not found, check current mappings returning immediately if found. */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { if (pv->pv_pmap == pmap) { - splx(s); return TRUE; } loops++; if (loops >= 16) break; } - splx(s); return (FALSE); } @@ -2276,14 +2254,12 @@ pv_entry_t pv; pt_entry_t *pte; int changed; - int s; if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || (!setem && bit == (PG_UWE|PG_KWE) && (m->flags & PG_WRITEABLE) == 0)) return; - s = splvm(); changed = 0; /* @@ -2326,7 +2302,6 @@ } if (!setem && bit == (PG_UWE|PG_KWE)) vm_page_flag_clear(m, PG_WRITEABLE); - splx(s); } /* ==== //depot/projects/gdb/sys/amd64/conf/GENERIC#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.412 2004/07/11 03:09:53 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.413 2004/07/16 21:48:30 ps Exp $ machine amd64 cpu HAMMER @@ -80,10 +80,6 @@ device isa device pci - -# Sound (no modules) -device pcm - # Floppy drives device fdc ==== //depot/projects/gdb/sys/boot/forth/loader.conf#10 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.82 2004/07/08 22:35:34 brian Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.83 2004/07/16 07:24:20 tanimura Exp $ ############################################################## ### Basic configuration options ############################ @@ -255,7 +255,7 @@ ### Sound modules ########################################## ############################################################## -snd_pcm_load="NO" # Digital sound subsystem +sound_load="NO" # Digital sound subsystem snd_ad1816_load="NO" # ad1816 snd_cmi_load="NO" # cmi snd_csa_load="NO" # csa ==== //depot/projects/gdb/sys/compat/ia32/ia32_sysvec.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.17 2004/03/21 01:22:24 peter Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<