From 59ff2ad5c76dd93b883ff0f8a7fdd96a30e6a19a Mon Sep 17 00:00:00 2001 From: sam Date: Tue, 19 Aug 2003 17:51:11 +0000 Subject: Change instances of callout_init that specify MPSAFE behaviour to use CALLOUT_MPSAFE instead of "1" for the second parameter. This does not change the behaviour; it just makes the intent more clear. --- sys/dev/dc/if_dc.c | 2 +- sys/dev/hifn/hifn7751.c | 6 ++---- sys/dev/patm/if_patm_attach.c | 2 +- sys/dev/rndtest/rndtest.c | 3 +-- sys/dev/safe/safe.c | 3 +-- sys/dev/ubsec/ubsec.c | 3 +-- sys/kern/init_main.c | 4 ++-- sys/kern/kern_fork.c | 2 +- sys/kern/kern_kse.c | 2 +- sys/kern/kern_synch.c | 2 +- sys/kern/kern_thread.c | 2 +- sys/kern/sched_4bsd.c | 2 +- sys/kern/sched_ule.c | 2 +- sys/net/bpf.c | 2 +- sys/netinet/tcp_syncache.c | 2 +- sys/pci/if_dc.c | 2 +- 16 files changed, 18 insertions(+), 23 deletions(-) diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index 7013a6c..dc938fa 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -2289,7 +2289,7 @@ dc_attach(device_t dev) ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); ifp->if_capabilities |= IFCAP_VLAN_MTU; - callout_init(&sc->dc_stat_ch, IS_MPSAFE); + callout_init(&sc->dc_stat_ch, IS_MPSAFE ? CALLOUT_MPSAFE : 0); #ifdef SRM_MEDIA sc->dc_srm_media = 0; diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c index 4486845..4f787c0 100644 --- a/sys/dev/hifn/hifn7751.c +++ b/sys/dev/hifn/hifn7751.c @@ -487,8 +487,7 @@ hifn_attach(device_t dev) if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG)) hifn_init_pubrng(sc); - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&sc->sc_tickto, 1); + callout_init(&sc->sc_tickto, CALLOUT_MPSAFE); callout_reset(&sc->sc_tickto, hz, hifn_tick, sc); return (0); @@ -687,8 +686,7 @@ hifn_init_pubrng(struct hifn_softc *sc) sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&sc->sc_rngto, 1); + callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); } diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c index 932bb6f..036bc41 100644 --- a/sys/dev/patm/if_patm_attach.c +++ b/sys/dev/patm/if_patm_attach.c @@ -204,7 +204,7 @@ patm_attach(device_t dev) mtx_init(&sc->tst_lock, "tst lock", NULL, MTX_DEF); cv_init(&sc->vcc_cv, "vcc_close"); - callout_init(&sc->tst_callout, 1); + callout_init(&sc->tst_callout, CALLOUT_MPSAFE); sysctl_ctx_init(&sc->sysctl_ctx); diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c index 15bbc09..5232095 100644 --- a/sys/dev/rndtest/rndtest.c +++ b/sys/dev/rndtest/rndtest.c @@ -96,8 +96,7 @@ rndtest_attach(device_t dev) #if __FreeBSD_version < 500000 callout_init(&rsp->rs_to); #else - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&rsp->rs_to, 1); + callout_init(&rsp->rs_to, CALLOUT_MPSAFE); #endif } else device_printf(dev, "rndtest_init: no memory for state block\n"); diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index 67f9233..ebd170e 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -441,8 +441,7 @@ safe_attach(device_t dev) #endif safe_rng_init(sc); - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&sc->sc_rngto, 1); + callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); callout_reset(&sc->sc_rngto, hz*safe_rnginterval, safe_rng, sc); } #endif /* SAFE_NO_RNG */ diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c index c9382ba..eb594c9 100644 --- a/sys/dev/ubsec/ubsec.c +++ b/sys/dev/ubsec/ubsec.c @@ -462,8 +462,7 @@ ubsec_attach(device_t dev) sc->sc_rnghz = hz / 100; else sc->sc_rnghz = 1; - /* NB: 1 means the callout runs w/o Giant locked */ - callout_init(&sc->sc_rngto, 1); + callout_init(&sc->sc_rngto, CALLOUT_MPSAFE); callout_reset(&sc->sc_rngto, sc->sc_rnghz, ubsec_rng, sc); skip_rng: ; diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 9af07a9..d006522 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -386,8 +386,8 @@ proc0_init(void *dummy __unused) bcopy("swapper", p->p_comm, sizeof ("swapper")); - callout_init(&p->p_itcallout, 1); - callout_init(&td->td_slpcallout, 1); + callout_init(&p->p_itcallout, CALLOUT_MPSAFE); + callout_init(&td->td_slpcallout, CALLOUT_MPSAFE); /* Create credentials. */ p->p_ucred = crget(); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 14f6377..5330dcd 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -592,7 +592,7 @@ again: PGRP_UNLOCK(p1->p_pgrp); LIST_INIT(&p2->p_children); - callout_init(&p2->p_itcallout, 1); + callout_init(&p2->p_itcallout, CALLOUT_MPSAFE); #ifdef KTRACE /* diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c index 2f93b1e..2af36c4 100644 --- a/sys/kern/kern_kse.c +++ b/sys/kern/kern_kse.c @@ -1337,7 +1337,7 @@ thread_link(struct thread *td, struct ksegrp *kg) td->td_kse = NULL; LIST_INIT(&td->td_contested); - callout_init(&td->td_slpcallout, 1); + callout_init(&td->td_slpcallout, CALLOUT_MPSAFE); TAILQ_INSERT_HEAD(&p->p_threads, td, td_plist); TAILQ_INSERT_HEAD(&kg->kg_threads, td, td_kglist); p->p_numthreads++; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 9e6dcf5..2733d42 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -652,7 +652,7 @@ sched_setup(dummy) void *dummy; { callout_init(&loadav_callout, 0); - callout_init(&lbolt_callout, 1); + callout_init(&lbolt_callout, CALLOUT_MPSAFE); /* Kick off timeout driven events by calling first time. */ loadav(NULL); diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 2f93b1e..2af36c4 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1337,7 +1337,7 @@ thread_link(struct thread *td, struct ksegrp *kg) td->td_kse = NULL; LIST_INIT(&td->td_contested); - callout_init(&td->td_slpcallout, 1); + callout_init(&td->td_slpcallout, CALLOUT_MPSAFE); TAILQ_INSERT_HEAD(&p->p_threads, td, td_plist); TAILQ_INSERT_HEAD(&kg->kg_threads, td, td_kglist); p->p_numthreads++; diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 2561759..67257bb 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -403,7 +403,7 @@ sched_setup(void *dummy) sched_quantum = SCHED_QUANTUM; hogticks = 2 * sched_quantum; - callout_init(&schedcpu_callout, 1); + callout_init(&schedcpu_callout, CALLOUT_MPSAFE); callout_init(&roundrobin_callout, 0); /* Kick off timeout driven events by calling first time. */ diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index a24154c..b5b31ba 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -569,7 +569,7 @@ sched_setup(void *dummy) kseq_cpu[i].ksq_cpus = cg->cg_count; } } - callout_init(&kseq_lb_callout, 1); + callout_init(&kseq_lb_callout, CALLOUT_MPSAFE); kseq_balance(NULL); #else kseq_setup(KSEQ_SELF()); diff --git a/sys/net/bpf.c b/sys/net/bpf.c index ff8112c..23a35cc 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -355,7 +355,7 @@ bpfopen(dev, flags, fmt, td) mac_create_bpfdesc(td->td_ucred, d); #endif mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF); - callout_init(&d->bd_callout, 1); + callout_init(&d->bd_callout, CALLOUT_MPSAFE); return (0); } diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 1f00101..031a7bc 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -269,7 +269,7 @@ syncache_init(void) /* Initialize the timer queues. */ for (i = 0; i <= SYNCACHE_MAXREXMTS; i++) { TAILQ_INIT(&tcp_syncache.timerq[i]); - callout_init(&tcp_syncache.tt_timerq[i], 1); + callout_init(&tcp_syncache.tt_timerq[i], CALLOUT_MPSAFE); } /* diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index 7013a6c..dc938fa 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -2289,7 +2289,7 @@ dc_attach(device_t dev) ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); ifp->if_capabilities |= IFCAP_VLAN_MTU; - callout_init(&sc->dc_stat_ch, IS_MPSAFE); + callout_init(&sc->dc_stat_ch, IS_MPSAFE ? CALLOUT_MPSAFE : 0); #ifdef SRM_MEDIA sc->dc_srm_media = 0; -- cgit v1.1