Date: Thu, 4 Apr 2002 11:22:46 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9042 for review Message-ID: <200204041922.g34JMkN24556@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9042 Change 9042 by jhb@jhb_laptop on 2002/04/04 11:22:13 Integ mtx_init() changes. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/interrupt.c#16 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#35 integrate ... //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#14 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#27 integrate ... //depot/projects/smpng/sys/dev/aac/aacvar.h#9 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#13 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#5 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#22 integrate ... //depot/projects/smpng/sys/dev/an/if_an.c#20 integrate ... //depot/projects/smpng/sys/dev/ar/if_ar.c#2 integrate ... //depot/projects/smpng/sys/dev/fxp/if_fxp.c#12 integrate ... //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#4 integrate ... //depot/projects/smpng/sys/dev/gx/if_gx.c#4 integrate ... //depot/projects/smpng/sys/dev/gx/if_gxvar.h#2 integrate ... //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#3 integrate ... //depot/projects/smpng/sys/dev/isp/isp_pci.c#9 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc.c#2 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#9 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbb.c#10 integrate ... //depot/projects/smpng/sys/dev/random/yarrow.c#4 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#16 integrate ... //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/isa/emu8000.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/isa/mpu.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/isa/mss.c#7 integrate ... //depot/projects/smpng/sys/dev/sound/isa/opl.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/isa/sbc.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/midi/midi.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/midi/timer.c#2 integrate ... //depot/projects/smpng/sys/dev/sound/pci/cmi.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pci/ds1.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#7 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#6 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/channel.c#14 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.h#7 integrate ... //depot/projects/smpng/sys/dev/sr/if_sr.c#2 integrate ... //depot/projects/smpng/sys/dev/txp/if_txp.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/if_cue.c#5 integrate ... //depot/projects/smpng/sys/dev/usb/if_kue.c#5 integrate ... //depot/projects/smpng/sys/dev/usb/udbp.c#2 integrate ... //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#3 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#4 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#27 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#5 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#5 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#3 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#8 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#11 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_event.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_io.c#3 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#31 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#21 integrate ... //depot/projects/smpng/sys/i386/i386/vm86.c#9 integrate ... //depot/projects/smpng/sys/i386/isa/if_el.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/intr_machdep.c#14 integrate ... //depot/projects/smpng/sys/i4b/capi/capi_l4if.c#4 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#4 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#4 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#4 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#8 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#5 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#5 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer1/isic/i4b_bchan.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/interrupt.c#9 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#24 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#5 integrate ... //depot/projects/smpng/sys/kern/init_main.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#31 integrate ... //depot/projects/smpng/sys/kern/kern_intr.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_jail.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_lock.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_mtxpool.c#4 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#26 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_sema.c#3 integrate ... //depot/projects/smpng/sys/kern/kern_timeout.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_disklabel.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_eventhandler.c#5 integrate ... //depot/projects/smpng/sys/kern/subr_mbuf.c#12 integrate ... //depot/projects/smpng/sys/kern/subr_rman.c#6 integrate ... //depot/projects/smpng/sys/kern/subr_smp.c#10 integrate ... //depot/projects/smpng/sys/kern/subr_taskqueue.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#40 integrate ... //depot/projects/smpng/sys/kern/sys_generic.c#11 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#13 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#15 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#19 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#23 integrate ... //depot/projects/smpng/sys/net/bpf.c#11 integrate ... //depot/projects/smpng/sys/net/if.c#20 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#12 integrate ... //depot/projects/smpng/sys/net/if_sl.c#11 integrate ... //depot/projects/smpng/sys/net/if_spppsubr.c#5 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#8 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#5 integrate ... //depot/projects/smpng/sys/netgraph/ng_base.c#6 integrate ... //depot/projects/smpng/sys/netinet/if_ether.c#11 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#16 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#12 integrate ... //depot/projects/smpng/sys/netipx/ipx_input.c#3 integrate ... //depot/projects/smpng/sys/netnatm/natm_proto.c#4 integrate ... //depot/projects/smpng/sys/netns/ns_input.c#3 integrate ... //depot/projects/smpng/sys/netsmb/smb_subr.h#7 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#27 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#16 integrate ... //depot/projects/smpng/sys/pci/if_dc.c#13 integrate ... //depot/projects/smpng/sys/pci/if_pcn.c#5 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#7 integrate ... //depot/projects/smpng/sys/pci/if_sf.c#6 integrate ... //depot/projects/smpng/sys/pci/if_sis.c#11 integrate ... //depot/projects/smpng/sys/pci/if_sk.c#5 integrate ... //depot/projects/smpng/sys/pci/if_ste.c#6 integrate ... //depot/projects/smpng/sys/pci/if_ti.c#9 integrate ... //depot/projects/smpng/sys/pci/if_tl.c#4 integrate ... //depot/projects/smpng/sys/pci/if_vr.c#4 integrate ... //depot/projects/smpng/sys/pci/if_wb.c#4 integrate ... //depot/projects/smpng/sys/pci/if_xl.c#9 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#13 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#5 integrate ... //depot/projects/smpng/sys/sys/mutex.h#25 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#20 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vfsops.c#5 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#11 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#4 integrate ... //depot/projects/smpng/sys/vm/device_pager.c#4 integrate ... //depot/projects/smpng/sys/vm/phys_pager.c#3 integrate ... //depot/projects/smpng/sys/vm/swap_pager.c#13 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#5 integrate ... //depot/projects/smpng/sys/vm/uma_int.h#3 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#8 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#12 integrate ... //depot/projects/smpng/sys/vm/vm_pageq.c#4 integrate ... //depot/projects/smpng/sys/vm/vm_pager.c#6 integrate ... //depot/projects/smpng/sys/vm/vm_zone.c#6 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#5 (text+ko) ==== @@ -600,7 +600,7 @@ count = 0; if (total_bpages == 0) { - mtx_init(&bounce_lock, "BouncePage", MTX_DEF); + mtx_init(&bounce_lock, "BouncePage", NULL, MTX_DEF); STAILQ_INIT(&bounce_page_list); STAILQ_INIT(&bounce_map_waitinglist); STAILQ_INIT(&bounce_map_callbacklist); ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#16 (text+ko) ==== @@ -343,7 +343,7 @@ ithds_init(void *dummy) { - mtx_init(&alpha_intr_hash_lock, "ithread table lock", MTX_SPIN); + mtx_init(&alpha_intr_hash_lock, "ithread table lock", NULL, MTX_SPIN); } SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#35 (text+ko) ==== @@ -945,8 +945,8 @@ thread0.td_pcb->pcb_hw.apcb_ksp = (u_int64_t)thread0.td_frame; mutex_init(); - mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); - mtx_init(&icu_lock, "icu", MTX_SPIN); + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN); /* * Look at arguments passed to us and compute boothowto. ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#14 (text+ko) ==== @@ -345,7 +345,7 @@ { int i; - mtx_init(&ap_boot_mtx, "ap boot", MTX_SPIN); + mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { int dv; ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#27 (text+ko) ==== @@ -1365,7 +1365,7 @@ } TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); - mtx_init(&allpmaps_lock, "allpmaps", MTX_SPIN | MTX_QUIET); + mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN | MTX_QUIET); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); } ==== //depot/projects/smpng/sys/dev/aac/aacvar.h#9 (text+ko) ==== @@ -254,7 +254,7 @@ #include <sys/lock.h> #include <sys/mutex.h> typedef struct mtx aac_lock_t; -#define AAC_LOCK_INIT(l, s) mtx_init(l, s, MTX_DEF) +#define AAC_LOCK_INIT(l, s) mtx_init(l, s, NULL, MTX_DEF) #define AAC_LOCK_ACQUIRE(l) mtx_lock(l) #define AAC_LOCK_RELEASE(l) mtx_unlock(l) #else ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#13 (text+ko) ==== @@ -144,7 +144,7 @@ err = 0; STAILQ_INIT(&acpi_task_queue); - mtx_init(&acpi_task_mtx, "ACPI task", MTX_DEF); + mtx_init(&acpi_task_mtx, "ACPI task", NULL, MTX_DEF); for (i = 0; i < ACPI_MAX_THREADS; i++) { err = kthread_create(acpi_task_thread, NULL, &acpi_kthread_proc, ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#5 (text+ko) ==== @@ -85,7 +85,7 @@ return_ACPI_STATUS(AE_NO_MEMORY); bzero(as, sizeof(*as)); - mtx_init(&as->as_mtx, "ACPI semaphore", MTX_DEF); + mtx_init(&as->as_mtx, "ACPI semaphore", NULL, MTX_DEF); as->as_units = InitialUnits; as->as_maxunits = MaxUnits; as->as_pendings = as->as_resetting = as->as_timeouts = 0; ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#22 (text+ko) ==== @@ -234,7 +234,7 @@ return_VOID; /* initialise the ACPI mutex */ - mtx_init(&acpi_mutex, "ACPI global lock", MTX_DEF); + mtx_init(&acpi_mutex, "ACPI global lock", NULL, MTX_DEF); /* * Start up the ACPI CA subsystem. ==== //depot/projects/smpng/sys/dev/an/if_an.c#20 (text+ko) ==== @@ -377,8 +377,8 @@ { struct ifnet *ifp = &sc->arpcom.ac_if; - mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_DEF | - MTX_RECURSE); + mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); AN_LOCK(sc); sc->an_gone = 0; ==== //depot/projects/smpng/sys/dev/ar/if_ar.c#2 (text+ko) ==== @@ -336,8 +336,9 @@ callout_handle_init(&sc->handle); sc->xmitq.ifq_maxlen = IFQ_MAXLEN; sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->xmitq.ifq_mtx, "ar_xmitq", MTX_DEF); - mtx_init(&sc->xmitq_hipri.ifq_mtx, "ar_xmitq_hipri", MTX_DEF); + mtx_init(&sc->xmitq.ifq_mtx, "ar_xmitq", NULL, MTX_DEF); + mtx_init(&sc->xmitq_hipri.ifq_mtx, "ar_xmitq_hipri", NULL, + MTX_DEF); sc->running = 0; #endif /* NETGRAPH */ } ==== //depot/projects/smpng/sys/dev/fxp/if_fxp.c#12 (text+ko) ==== @@ -360,7 +360,8 @@ sc->dev = dev; callout_handle_init(&sc->stat_ch); sysctl_ctx_init(&sc->sysctl_ctx); - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); s = splimp(); ==== //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#4 (text+ko) ==== @@ -91,7 +91,7 @@ #if __FreeBSD_version < 500000 #define FXP_LOCK(_sc) #define FXP_UNLOCK(_sc) -#define mtx_init(a, b, c) +#define mtx_init(a, b, c, d) #define mtx_destroy(a) struct mtx { int dummy; }; #else ==== //depot/projects/smpng/sys/dev/gx/if_gx.c#4 (text+ko) ==== @@ -245,7 +245,8 @@ gx->gx_vflags = gx_dev->version_flags; gx->gx_ipg = gx_dev->version_ipg; - mtx_init(&gx->gx_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&gx->gx_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); GX_LOCK(gx); ==== //depot/projects/smpng/sys/dev/gx/if_gxvar.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ #if __FreeBSD_version < 500000 #define GX_LOCK(gx) #define GX_UNLOCK(gx) -#define mtx_init(a, b, c) +#define mtx_init(a, b, c, d) #define mtx_destroy(a) struct mtx { int filler; }; #else ==== //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#3 (text+ko) ==== @@ -129,7 +129,7 @@ } /* Create mutex */ - mtx_init(&sc->mutex, device_get_nameunit(dev), MTX_DEF); + mtx_init(&sc->mutex, device_get_nameunit(dev), "ichsmb", MTX_DEF); return (0); } ==== //depot/projects/smpng/sys/dev/isp/isp_pci.c#9 (text+ko) ==== @@ -683,7 +683,7 @@ "debug", &isp_debug); /* Make sure the lock is set up. */ - mtx_init(&isp->isp_osinfo.lock, "isp", MTX_DEF); + mtx_init(&isp->isp_osinfo.lock, "isp", NULL, MTX_DEF); locksetup++; #ifdef ISP_SMPLOCK ==== //depot/projects/smpng/sys/dev/lmc/if_lmc.c#2 (text+ko) ==== @@ -1148,8 +1148,8 @@ callout_handle_init(&sc->lmc_handle); sc->lmc_xmitq.ifq_maxlen = IFQ_MAXLEN; sc->lmc_xmitq_hipri.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->lmc_xmitq.ifq_mtx, "lmc_xmitq", MTX_DEF); - mtx_init(&sc->lmc_xmitq_hipri.ifq_mtx, "lmc_xmitq_hipri", MTX_DEF); + mtx_init(&sc->lmc_xmitq.ifq_mtx, "lmc_xmitq", NULL, MTX_DEF); + mtx_init(&sc->lmc_xmitq_hipri.ifq_mtx, "lmc_xmitq_hipri", NULL, MTX_DEF); sc->lmc_running = 0; /* ==== //depot/projects/smpng/sys/dev/nge/if_nge.c#9 (text+ko) ==== @@ -797,7 +797,8 @@ unit = device_get_unit(dev); bzero(sc, sizeof(struct nge_softc)); - mtx_init(&sc->nge_mtx, device_get_nameunit(dev), MTX_DEF|MTX_RECURSE); + mtx_init(&sc->nge_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); /* * Handle power management nonsense. ==== //depot/projects/smpng/sys/dev/pccbb/pccbb.c#10 (text+ko) ==== @@ -527,7 +527,7 @@ int rid; uint32_t sockbase; - mtx_init(&sc->mtx, device_get_nameunit(brdev), MTX_DEF); + mtx_init(&sc->mtx, device_get_nameunit(brdev), "pccbb", MTX_DEF); sc->chipset = pccbb_chipset(pci_get_devid(brdev), NULL); sc->dev = brdev; sc->cbdev = NULL; ==== //depot/projects/smpng/sys/dev/random/yarrow.c#4 (text+ko) ==== @@ -139,7 +139,7 @@ random_state.counter[i] = 0; /* Set up a lock for the reseed process */ - mtx_init(&random_reseed_mtx, "random reseed", MTX_DEF); + mtx_init(&random_reseed_mtx, "random reseed", NULL, MTX_DEF); } void ==== //depot/projects/smpng/sys/dev/sio/sio.c#16 (text+ko) ==== @@ -513,7 +513,8 @@ while (sio_inited != 2) if (atomic_cmpset_int(&sio_inited, 0, 1)) { - mtx_init(&sio_lock, sio_driver_name, (comconsole != -1) ? + mtx_init(&sio_lock, sio_driver_name, NULL, + (comconsole != -1) ? MTX_SPIN | MTX_QUIET : MTX_SPIN); atomic_store_rel_int(&sio_inited, 2); } ==== //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#4 (text+ko) ==== @@ -587,7 +587,7 @@ ad1816 = (struct ad1816_info *)malloc(sizeof *ad1816, M_DEVBUF, M_NOWAIT | M_ZERO); if (!ad1816) return ENXIO; - ad1816->lock = snd_mtxcreate(device_get_nameunit(dev)); + ad1816->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); ad1816->io_rid = 2; ad1816->irq_rid = 0; ad1816->drq1_rid = 0; ==== //depot/projects/smpng/sys/dev/sound/isa/emu8000.c#5 (text+ko) ==== @@ -720,7 +720,7 @@ /* Fill the softc for this unit. */ bcopy(&emu_synthinfo, &scp->synthinfo, sizeof(emu_synthinfo)); - mtx_init(&scp->mtx, "emumid", MTX_DEF); + mtx_init(&scp->mtx, "emumid", NULL, MTX_DEF); scp->devinfo = devinfo = create_mididev_info_unit(MDT_SYNTH, &emu_op_desc, &midisynth_op_desc); /* Fill the midi info. */ ==== //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#4 (text+ko) ==== @@ -194,7 +194,7 @@ /* Fill the softc. */ scp->dev = dev; - mtx_init(&scp->mtx, "gusmid", MTX_DEF); + mtx_init(&scp->mtx, "gusmid", NULL, MTX_DEF); scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &gusmidi_op_desc, &midisynth_op_desc); /* Fill the midi info. */ ==== //depot/projects/smpng/sys/dev/sound/isa/mpu.c#8 (text+ko) ==== @@ -358,7 +358,7 @@ MIDI_DEBUG(printf("mpu: attaching.\n")); - mtx_init(&scp->mtx, "mpumid", MTX_DEF); + mtx_init(&scp->mtx, "mpumid", NULL, MTX_DEF); /* Allocate the resources, switch to uart mode. */ if (mpu_allocres(scp, dev) || mpu_uartmode(scp)) { ==== //depot/projects/smpng/sys/dev/sound/isa/mss.c#7 (text+ko) ==== @@ -1665,7 +1665,7 @@ int pdma, rdma, flags = device_get_flags(dev); char status[SND_STATUSLEN], status2[SND_STATUSLEN]; - mss->lock = snd_mtxcreate(device_get_nameunit(dev)); + mss->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); mss->bufsize = pcm_getbuffersize(dev, 4096, MSS_DEFAULT_BUFSZ, 65536); if (!mss_alloc_resources(mss, dev)) goto no; mss_init(mss, dev); ==== //depot/projects/smpng/sys/dev/sound/isa/opl.c#4 (text+ko) ==== @@ -717,7 +717,7 @@ /* Fill the softc. */ bcopy(&opl_synthinfo, &scp->synthinfo, sizeof(opl_synthinfo)); snprintf(scp->synthinfo.name, 64, "Yamaha OPL%d FM", scp->model); - mtx_init(&scp->mtx, "oplmid", MTX_DEF); + mtx_init(&scp->mtx, "oplmid", NULL, MTX_DEF); bcopy(pv_map, scp->pv_map, sizeof(pv_map)); if (scp->model < MODEL_OPL3) { /* OPL2. */ scp->synthinfo.nr_voices = 9; ==== //depot/projects/smpng/sys/dev/sound/isa/sbc.c#4 (text+ko) ==== @@ -114,7 +114,7 @@ static void sbc_lockinit(struct sbc_softc *scp) { - scp->lock = snd_mtxcreate(device_get_nameunit(scp->dev)); + scp->lock = snd_mtxcreate(device_get_nameunit(scp->dev), "sound softc"); } static void ==== //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#5 (text+ko) ==== @@ -243,7 +243,7 @@ /* Fill the softc. */ scp->dev = dev; - mtx_init(&scp->mtx, "siomid", MTX_DEF); + mtx_init(&scp->mtx, "siomid", NULL, MTX_DEF); scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &uartsio_op_desc, &midisynth_op_desc); /* Fill the midi info. */ ==== //depot/projects/smpng/sys/dev/sound/midi/midi.c#4 (text+ko) ==== @@ -200,7 +200,7 @@ /* XXX */ if (!midiinfo_mtx_init) { midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", MTX_DEF); + mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); TAILQ_INIT(&midi_info); } @@ -226,7 +226,7 @@ /* XXX */ if (!midiinfo_mtx_init) { midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", MTX_DEF); + mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); TAILQ_INIT(&midi_info); } @@ -252,7 +252,7 @@ /* XXX */ if (!midiinfo_mtx_init) { midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", MTX_DEF); + mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); TAILQ_INIT(&midi_info); } @@ -277,7 +277,7 @@ /* XXX */ if (!midiinfo_mtx_init) { midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", MTX_DEF); + mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); TAILQ_INIT(&midi_info); } @@ -290,9 +290,9 @@ midibuf_init(&mdnew->midi_dbuf_in); midibuf_init(&mdnew->midi_dbuf_out); midibuf_init(&mdnew->midi_dbuf_passthru); - mtx_init(&mdnew->flagqueue_mtx, "midflq", MTX_DEF); - mtx_init(&mdnew->synth.vc_mtx, "synsvc", MTX_DEF); - mtx_init(&mdnew->synth.status_mtx, "synsst", MTX_DEF); + mtx_init(&mdnew->flagqueue_mtx, "midflq", NULL, MTX_DEF); + mtx_init(&mdnew->synth.vc_mtx, "synsvc", NULL, MTX_DEF); + mtx_init(&mdnew->synth.status_mtx, "synsst", NULL, MTX_DEF); mtx_lock(&midiinfo_mtx); ==== //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#5 (text+ko) ==== @@ -303,7 +303,7 @@ { SEQ_DEBUG(printf("seq: initing.\n")); - mtx_init(&seqinfo_mtx, "seqinf", MTX_DEF); + mtx_init(&seqinfo_mtx, "seqinf", NULL, MTX_DEF); TAILQ_INIT(&seq_info); seq_initunit(0); @@ -2371,7 +2371,7 @@ sdnew->unit = unit; midibuf_init(&sdnew->midi_dbuf_in); midibuf_init(&sdnew->midi_dbuf_out); - mtx_init(&sdnew->flagqueue_mtx, "seqflq", MTX_DEF); + mtx_init(&sdnew->flagqueue_mtx, "seqflq", NULL, MTX_DEF); cv_init(&sdnew->insync_cv, "seqins"); mtx_lock(&seqinfo_mtx); ==== //depot/projects/smpng/sys/dev/sound/midi/timer.c#2 (text+ko) ==== @@ -141,7 +141,7 @@ /* XXX */ if (!timerinfo_mtx_init) { timerinfo_mtx_init = 1; - mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF); + mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF); TAILQ_INIT(&timer_info); } @@ -150,7 +150,7 @@ if (tmdnew == NULL) return NULL; bcopy(tmdinf, tmdnew, sizeof(timerdev_info)); - mtx_init(&tmdnew->mtx, "tmrmtx", MTX_DEF); + mtx_init(&tmdnew->mtx, "tmrmtx", NULL, MTX_DEF); mtx_lock(&timerinfo_mtx); @@ -195,7 +195,7 @@ /* XXX */ if (!timerinfo_mtx_init) { timerinfo_mtx_init = 1; - mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF); + mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF); TAILQ_INIT(&timer_info); } @@ -224,7 +224,7 @@ /* XXX */ if (!timerinfo_mtx_init) { timerinfo_mtx_init = 1; - mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF); + mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF); TAILQ_INIT(&timer_info); } ==== //depot/projects/smpng/sys/dev/sound/pci/cmi.c#8 (text+ko) ==== @@ -842,7 +842,7 @@ return ENXIO; } - sc->lock = snd_mtxcreate(device_get_nameunit(dev)); + sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); data = pci_read_config(dev, PCIR_COMMAND, 2); data |= (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN); pci_write_config(dev, PCIR_COMMAND, data, 2); ==== //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#4 (text+ko) ==== @@ -192,7 +192,7 @@ /* Fill the softc. */ scp->dev = dev; - mtx_init(&scp->mtx, "csamid", MTX_DEF); + mtx_init(&scp->mtx, "csamid", NULL, MTX_DEF); scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &csamidi_op_desc, &midisynth_op_desc); /* Fill the midi info. */ ==== //depot/projects/smpng/sys/dev/sound/pci/ds1.c#4 (text+ko) ==== @@ -939,7 +939,7 @@ return ENXIO; } - sc->lock = snd_mtxcreate(device_get_nameunit(dev)); + sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); sc->dev = dev; subdev = (pci_get_subdevice(dev) << 16) | pci_get_subvendor(dev); sc->type = ds_finddev(pci_get_devid(dev), subdev); ==== //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#4 (text+ko) ==== @@ -1460,7 +1460,7 @@ return ENXIO; } - sc->lock = snd_mtxcreate(device_get_nameunit(dev)); + sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); sc->dev = dev; sc->type = pci_get_devid(dev); sc->rev = pci_get_revid(dev); ==== //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#7 (text+ko) ==== @@ -765,7 +765,7 @@ } tr->type = pci_get_devid(dev); - tr->lock = snd_mtxcreate(device_get_nameunit(dev)); + tr->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); data = pci_read_config(dev, PCIR_COMMAND, 2); data |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN); ==== //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#6 (text+ko) ==== @@ -498,7 +498,7 @@ return NULL; snprintf(codec->name, AC97_NAMELEN, "%s:ac97", device_get_nameunit(dev)); - codec->lock = snd_mtxcreate(codec->name); + codec->lock = snd_mtxcreate(codec->name, "ac97 codec"); codec->methods = kobj_create(cls, M_AC97, M_WAITOK); if (codec->methods == NULL) { snd_mtxlock(codec->lock); ==== //depot/projects/smpng/sys/dev/sound/pcm/channel.c#14 (text+ko) ==== @@ -70,7 +70,7 @@ static void chn_lockinit(struct pcm_channel *c) { - c->lock = snd_mtxcreate(c->name); + c->lock = snd_mtxcreate(c->name, "pcm channel"); } static void ==== //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#4 (text+ko) ==== @@ -202,7 +202,7 @@ m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO); snprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev)); - m->lock = snd_mtxcreate(m->name); + m->lock = snd_mtxcreate(m->name, "pcm mixer"); m->type = cls->name; m->devinfo = devinfo; m->busy = 0; ==== //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#4 (text+ko) ==== @@ -343,7 +343,7 @@ static int sndstat_init(void) { - mtx_init(&sndstat_lock, "sndstat", 0); + mtx_init(&sndstat_lock, "sndstat", NULL, 0); sndstat_dev = make_dev(&sndstat_cdevsw, SND_DEV_STATUS, UID_ROOT, GID_WHEEL, 0444, "sndstat"); return (sndstat_dev != 0)? 0 : ENXIO; ==== //depot/projects/smpng/sys/dev/sound/pcm/sound.c#8 (text+ko) ==== @@ -86,7 +86,7 @@ } void * -snd_mtxcreate(const char *desc) +snd_mtxcreate(const char *desc, const char *type) { #ifdef USING_MUTEX struct mtx *m; @@ -94,7 +94,7 @@ m = malloc(sizeof(*m), M_DEVBUF, M_WAITOK | M_ZERO); if (m == NULL) return NULL; - mtx_init(m, desc, MTX_RECURSE); + mtx_init(m, desc, type, MTX_RECURSE); return m; #else return (void *)0xcafebabe; @@ -607,7 +607,7 @@ return EINVAL; } - d->lock = snd_mtxcreate(device_get_nameunit(dev)); + d->lock = snd_mtxcreate(device_get_nameunit(dev), "sound cdev"); snd_mtxlock(d->lock); d->flags = 0; ==== //depot/projects/smpng/sys/dev/sound/pcm/sound.h#7 (text+ko) ==== @@ -244,7 +244,7 @@ int snd_setup_intr(device_t dev, struct resource *res, int flags, driver_intr_t hand, void *param, void **cookiep); -void *snd_mtxcreate(const char *desc); +void *snd_mtxcreate(const char *desc, const char *type); void snd_mtxfree(void *m); void snd_mtxassert(void *m); void snd_mtxlock(void *m); ==== //depot/projects/smpng/sys/dev/sr/if_sr.c#2 (text+ko) ==== @@ -449,8 +449,9 @@ callout_handle_init(&sc->handle); sc->xmitq.ifq_maxlen = IFQ_MAXLEN; sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->xmitq.ifq_mtx, "sr_xmitq", MTX_DEF); - mtx_init(&sc->xmitq_hipri.ifq_mtx, "sr_xmitq_hipri", MTX_DEF); + mtx_init(&sc->xmitq.ifq_mtx, "sr_xmitq", NULL, MTX_DEF); + mtx_init(&sc->xmitq_hipri.ifq_mtx, "sr_xmitq_hipri", NULL, + MTX_DEF); sc->running = 0; #endif /* NETGRAPH */ } ==== //depot/projects/smpng/sys/dev/txp/if_txp.c#8 (text+ko) ==== @@ -218,7 +218,8 @@ sc->sc_dev = dev; sc->sc_cold = 1; - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_DEF|MTX_RECURSE); + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); /* * Handle power management nonsense. ==== //depot/projects/smpng/sys/dev/usb/if_aue.c#10 (text+ko) ==== @@ -706,8 +706,8 @@ } } - mtx_init(&sc->aue_mtx, device_get_nameunit(self), MTX_DEF | - MTX_RECURSE); + mtx_init(&sc->aue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); AUE_LOCK(sc); /* Reset the adapter. */ ==== //depot/projects/smpng/sys/dev/usb/if_cue.c#5 (text+ko) ==== @@ -491,8 +491,8 @@ } } - mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_DEF | - MTX_RECURSE); + mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); CUE_LOCK(sc); #ifdef notdef ==== //depot/projects/smpng/sys/dev/usb/if_kue.c#5 (text+ko) ==== @@ -441,8 +441,8 @@ } } - mtx_init(&sc->kue_mtx, device_get_nameunit(self), MTX_DEF | - MTX_RECURSE); + mtx_init(&sc->kue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); KUE_LOCK(sc); /* Load the firmware into the NIC. */ ==== //depot/projects/smpng/sys/dev/usb/udbp.c#2 (text+ko) ==== @@ -368,9 +368,10 @@ NG_NODE_SET_PRIVATE(sc->node, sc); sc->xmitq.ifq_maxlen = IFQ_MAXLEN; sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->xmitq.ifq_mtx, "usb_xmitq", MTX_DEF); + mtx_init(&sc->xmitq.ifq_mtx, "usb_xmitq", NULL, + MTX_DEF); mtx_init(&sc->xmitq_hipri.ifq_mtx, - "usb_xmitq_hipri", MTX_DEF); + "usb_xmitq_hipri", NULL, MTX_DEF); } } sc->flags = NETGRAPH_INITIALISED; ==== //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#3 (text+ko) ==== @@ -122,8 +122,8 @@ if (mtx_inited) return; register_netisr(NETISR_USB, usbintr); - mtx_init(&usbq_tx.ifq_mtx, "usbq_tx_mtx", MTX_DEF); - mtx_init(&usbq_rx.ifq_mtx, "usbq_rx_mtx", MTX_DEF); + mtx_init(&usbq_tx.ifq_mtx, "usbq_tx_mtx", NULL, MTX_DEF); + mtx_init(&usbq_rx.ifq_mtx, "usbq_rx_mtx", NULL, MTX_DEF); mtx_inited++; return; } ==== //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#4 (text+ko) ==== @@ -1415,7 +1415,7 @@ Malloc(PLEX_LOCKS * sizeof(struct rangelock)); CHECKALLOC(plex->lock, "vinum: Can't allocate lock table\n"); bzero((char *) plex->lock, PLEX_LOCKS * sizeof(struct rangelock)); - mtx_init(&plex->lockmtx, plex->name, MTX_DEF); + mtx_init(&plex->lockmtx, plex->name, "plex", MTX_DEF); } /* Note the last plex we configured */ current_plex = plexno; ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#27 (text+ko) ==== @@ -196,7 +196,8 @@ return (error); } - mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); WI_LOCK(sc); /* Reset the NIC. */ ==== //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#5 (text+ko) ==== @@ -66,7 +66,7 @@ lockinit (&hpfs_hphash_lock, PINOD, "hpfs_hphashlock", 0, 0); hpfs_hphashtbl = hashinit(desiredvnodes, M_HPFSHASH, &hpfs_hphash); - mtx_init(&hpfs_hphash_mtx, "hpfs hphash", MTX_DEF); + mtx_init(&hpfs_hphash_mtx, "hpfs hphash", NULL, MTX_DEF); } /* ==== //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#9 (text+ko) ==== @@ -511,7 +511,7 @@ vp->v_flag |= VROOT; - mtx_init(&hp->h_interlock, "hpfsnode interlock", MTX_DEF); + mtx_init(&hp->h_interlock, "hpfsnode interlock", NULL, MTX_DEF); lockinit(&hp->h_lock, PINOD, "hpnode", VLKTIMEOUT, 0); hp->h_flag = H_INVAL; ==== //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#5 (text+ko) ==== @@ -103,7 +103,7 @@ struct vfsconf *vfsp; { dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, &dehash); - mtx_init(&dehash_mtx, "msdosfs dehash", MTX_DEF); + mtx_init(&dehash_mtx, "msdosfs dehash", NULL, MTX_DEF); return (0); } ==== //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#3 (text+ko) ==== @@ -68,7 +68,7 @@ { lockinit(&ntfs_hashlock, PINOD, "ntfs_nthashlock", 0, 0); ntfs_nthashtbl = hashinit(desiredvnodes, M_NTFSNTHASH, &ntfs_nthash); - mtx_init(&ntfs_nthash_mtx, "ntfs nthash", MTX_DEF); + mtx_init(&ntfs_nthash_mtx, "ntfs nthash", NULL, MTX_DEF); } /* ==== //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#8 (text+ko) ==== @@ -404,7 +404,7 @@ /* init lock and lock the newborn ntnode */ lockinit(&ip->i_lock, PINOD, "ntnode", 0, LK_EXCLUSIVE); - mtx_init(&ip->i_interlock, "ntnode interlock", MTX_DEF); + mtx_init(&ip->i_interlock, "ntnode interlock", NULL, MTX_DEF); ntfs_ntget(ip); ntfs_nthashins(ip); ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#11 (text+ko) ==== @@ -313,7 +313,7 @@ struct pfs_node *root; int error; - mtx_init(&pi->pi_mutex, "pseudofs", MTX_DEF); + mtx_init(&pi->pi_mutex, "pseudofs", NULL, MTX_DEF); /* set up the root diretory */ MALLOC(root, struct pfs_node *, sizeof *root, ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204041922.g34JMkN24556>