svn commit: r247699 - in projects/calloutng/sys: dev/random dev/syscons kern sys
Alexander Motin
mav at FreeBSD.org
Sun Mar 3 09:13:21 UTC 2013
Author: mav
Date: Sun Mar 3 09:13:17 2013
New Revision: 247699
URL: http://svnweb.freebsd.org/changeset/base/247699
Log:
Remove unused TIME_T_MAX macro from kern_timeout.c.
Tune some style.
Modified:
projects/calloutng/sys/dev/random/randomdev_soft.c
projects/calloutng/sys/dev/syscons/syscons.c
projects/calloutng/sys/kern/kern_clocksource.c
projects/calloutng/sys/kern/kern_event.c
projects/calloutng/sys/kern/kern_synch.c
projects/calloutng/sys/kern/kern_timeout.c
projects/calloutng/sys/kern/sys_generic.c
projects/calloutng/sys/sys/condvar.h
projects/calloutng/sys/sys/mutex.h
projects/calloutng/sys/sys/rwlock.h
projects/calloutng/sys/sys/sleepqueue.h
projects/calloutng/sys/sys/sx.h
projects/calloutng/sys/sys/systm.h
projects/calloutng/sys/sys/time.h
Modified: projects/calloutng/sys/dev/random/randomdev_soft.c
==============================================================================
--- projects/calloutng/sys/dev/random/randomdev_soft.c Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/dev/random/randomdev_soft.c Sun Mar 3 09:13:17 2013 (r247699)
@@ -283,7 +283,7 @@ random_kthread(void *arg __unused)
/* Work done, so don't belabour the issue */
msleep_spin_sbt(&random_kthread_control, &harvest_mtx,
- "-", (SBT_1S / 10), 0, C_PREL(1));
+ "-", SBT_1S / 10, 0, C_PREL(1));
}
mtx_unlock_spin(&harvest_mtx);
Modified: projects/calloutng/sys/dev/syscons/syscons.c
==============================================================================
--- projects/calloutng/sys/dev/syscons/syscons.c Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/dev/syscons/syscons.c Sun Mar 3 09:13:17 2013 (r247699)
@@ -1918,7 +1918,7 @@ done:
rate = 2;
else
rate = 30;
- callout_reset_sbt(&sc->ctimeout, (SBT_1S / rate), 0,
+ callout_reset_sbt(&sc->ctimeout, SBT_1S / rate, 0,
scrn_timer, sc, C_PREL(1));
}
}
@@ -3864,7 +3864,7 @@ blink_screen(void *arg)
(*scp->rndr->draw)(scp, 0, scp->xsize*scp->ysize,
scp->sc->blink_in_progress & 1);
scp->sc->blink_in_progress--;
- callout_reset_sbt(&scp->sc->cblink, (SBT_1S / 15), 0,
+ callout_reset_sbt(&scp->sc->cblink, SBT_1S / 15, 0,
blink_screen, scp, C_PREL(0));
}
}
Modified: projects/calloutng/sys/kern/kern_clocksource.c
==============================================================================
--- projects/calloutng/sys/kern/kern_clocksource.c Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/kern/kern_clocksource.c Sun Mar 3 09:13:17 2013 (r247699)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sched.h>
#include <sys/smp.h>
#include <sys/sysctl.h>
-#include <sys/time.h>
#include <sys/timeet.h>
#include <sys/timetc.h>
@@ -252,7 +251,7 @@ getnextcpuevent(int idle)
u_int hardfreq;
state = DPCPU_PTR(timerstate);
- /* Handle hardclock() events, skipping some is CPU is idle. */
+ /* Handle hardclock() events, skipping some if CPU is idle. */
event = state->nexthard;
if (idle) {
hardfreq = (u_int)hz / 2;
Modified: projects/calloutng/sys/kern/kern_event.c
==============================================================================
--- projects/calloutng/sys/kern/kern_event.c Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/kern/kern_event.c Sun Mar 3 09:13:17 2013 (r247699)
@@ -517,11 +517,11 @@ knote_fork(struct knlist *list, int pid)
* XXX: EVFILT_TIMER should perhaps live in kern_time.c beside the
* interval timer support code.
*/
-static __inline sbintime_t
+static __inline sbintime_t
timer2sbintime(intptr_t data)
{
- return (SBT_1MS * data);
+ return (SBT_1MS * data);
}
static void
Modified: projects/calloutng/sys/kern/kern_synch.c
==============================================================================
--- projects/calloutng/sys/kern/kern_synch.c Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/kern/kern_synch.c Sun Mar 3 09:13:17 2013 (r247699)
@@ -353,7 +353,7 @@ pause_sbt(const char *wmesg, sbintime_t
{
int sbt_sec;
- sbt_sec = sbintime_getsec(sbt);
+ sbt_sec = sbintime_getsec(sbt);
KASSERT(sbt_sec >= 0, ("pause: timo must be >= 0"));
/* silently convert invalid timeouts */
Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/kern/kern_timeout.c Sun Mar 3 09:13:17 2013 (r247699)
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sleepqueue.h>
#include <sys/sysctl.h>
#include <sys/smp.h>
-#include <sys/time.h>
#ifdef SMP
#include <machine/cpu.h>
@@ -176,9 +175,6 @@ struct callout_cpu cc_cpu;
#define CC_UNLOCK(cc) mtx_unlock_spin(&(cc)->cc_lock)
#define CC_LOCK_ASSERT(cc) mtx_assert(&(cc)->cc_lock, MA_OWNED)
-#define TIME_T_MAX \
- (sizeof(time_t) == (sizeof(int64_t)) ? INT64_MAX : INT32_MAX)
-
static int timeout_cpu;
static void
softclock_call_cc(struct callout *c, struct callout_cpu *cc,
@@ -553,7 +549,7 @@ callout_cc_add(struct callout *c, struct
c->c_precision = precision;
bucket = callout_get_bucket(c->c_time);
CTR3(KTR_CALLOUT, "precision set for %p: %d.%08x",
- c, (int)(c->c_precision >> 32),
+ c, (int)(c->c_precision >> 32),
(u_int)(c->c_precision & 0xffffffff));
LIST_INSERT_HEAD(&cc->cc_callwheel[bucket], c, c_links.le);
if (cc->cc_bucket == bucket)
@@ -1008,7 +1004,7 @@ callout_reset_sbt_on(struct callout *c,
callout_cc_add(c, cc, to_sbt, precision, ftn, arg, cpu, flags);
CTR6(KTR_CALLOUT, "%sscheduled %p func %p arg %p in %d.%08x",
- cancelled ? "re" : "", c, c->c_func, c->c_arg,(int)(to_sbt >> 32),
+ cancelled ? "re" : "", c, c->c_func, c->c_arg, (int)(to_sbt >> 32),
(u_int)(to_sbt & 0xffffffff));
CC_UNLOCK(cc);
Modified: projects/calloutng/sys/kern/sys_generic.c
==============================================================================
--- projects/calloutng/sys/kern/sys_generic.c Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/kern/sys_generic.c Sun Mar 3 09:13:17 2013 (r247699)
@@ -1056,7 +1056,7 @@ kern_select(struct thread *td, int nd, f
precision >>= tc_precexp;
if (TIMESEL(&asbt, rsbt))
asbt += tc_tick_sbt;
- asbt += rsbt;
+ asbt += rsbt;
} else
asbt = -1;
seltdinit(td);
@@ -1295,7 +1295,7 @@ sys_poll(td, uap)
error = EINVAL;
goto done;
}
- rsbt = SBT_1MS * uap->timeout;
+ rsbt = SBT_1MS * uap->timeout;
precision = rsbt;
precision >>= tc_precexp;
if (TIMESEL(&asbt, rsbt))
Modified: projects/calloutng/sys/sys/condvar.h
==============================================================================
--- projects/calloutng/sys/sys/condvar.h Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/sys/condvar.h Sun Mar 3 09:13:17 2013 (r247699)
@@ -71,12 +71,12 @@ void cv_broadcastpri(struct cv *cvp, int
_cv_wait_sig((cvp), &(lock)->lock_object)
#define cv_timedwait(cvp, lock, timo) \
_cv_timedwait_sbt((cvp), &(lock)->lock_object, \
- (tick_sbt * (timo)), 0, C_HARDCLOCK)
+ tick_sbt * (timo), 0, C_HARDCLOCK)
#define cv_timedwait_sbt(cvp, lock, sbt, pr, flags) \
_cv_timedwait_sbt((cvp), &(lock)->lock_object, (sbt), (pr), (flags))
#define cv_timedwait_sig(cvp, lock, timo) \
_cv_timedwait_sig_sbt((cvp), &(lock)->lock_object, \
- (tick_sbt * (timo)), 0, C_HARDCLOCK)
+ tick_sbt * (timo), 0, C_HARDCLOCK)
#define cv_timedwait_sig_sbt(cvp, lock, sbt, pr, flags) \
_cv_timedwait_sig_sbt((cvp), &(lock)->lock_object, (sbt), (pr), (flags))
Modified: projects/calloutng/sys/sys/mutex.h
==============================================================================
--- projects/calloutng/sys/sys/mutex.h Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/sys/mutex.h Sun Mar 3 09:13:17 2013 (r247699)
@@ -377,7 +377,7 @@ extern struct mtx_pool *mtxpool_sleep;
#define mtx_sleep(chan, mtx, pri, wmesg, timo) \
_sleep((chan), &(mtx)->lock_object, (pri), (wmesg), \
- (tick_sbt * (timo)), 0, C_HARDCLOCK)
+ tick_sbt * (timo), 0, C_HARDCLOCK)
#define mtx_initialized(m) lock_initalized(&(m)->lock_object)
Modified: projects/calloutng/sys/sys/rwlock.h
==============================================================================
--- projects/calloutng/sys/sys/rwlock.h Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/sys/rwlock.h Sun Mar 3 09:13:17 2013 (r247699)
@@ -212,7 +212,7 @@ void __rw_assert(const volatile uintptr_
} while (0)
#define rw_sleep(chan, rw, pri, wmesg, timo) \
_sleep((chan), &(rw)->lock_object, (pri), (wmesg), \
- (tick_sbt * (timo)), 0, C_HARDCLOCK)
+ tick_sbt * (timo), 0, C_HARDCLOCK)
#define rw_initialized(rw) lock_initalized(&(rw)->lock_object)
Modified: projects/calloutng/sys/sys/sleepqueue.h
==============================================================================
--- projects/calloutng/sys/sys/sleepqueue.h Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/sys/sleepqueue.h Sun Mar 3 09:13:17 2013 (r247699)
@@ -111,7 +111,7 @@ int sleepq_signal(void *wchan, int flags
void sleepq_set_timeout_sbt(void *wchan, sbintime_t sbt,
sbintime_t pr, int flags);
#define sleepq_set_timeout(wchan, timo) \
- sleepq_set_timeout_sbt((wchan), (tick_sbt * (timo)), 0, C_HARDCLOCK)
+ sleepq_set_timeout_sbt((wchan), tick_sbt * (timo), 0, C_HARDCLOCK)
u_int sleepq_sleepcnt(void *wchan, int queue);
int sleepq_timedwait(void *wchan, int pri);
int sleepq_timedwait_sig(void *wchan, int pri);
Modified: projects/calloutng/sys/sys/sx.h
==============================================================================
--- projects/calloutng/sys/sys/sx.h Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/sys/sx.h Sun Mar 3 09:13:17 2013 (r247699)
@@ -276,7 +276,7 @@ __sx_sunlock(struct sx *sx, const char *
#define sx_sleep(chan, sx, pri, wmesg, timo) \
_sleep((chan), &(sx)->lock_object, (pri), (wmesg), \
- (tick_sbt * (timo)), 0, C_HARDCLOCK)
+ tick_sbt * (timo), 0, C_HARDCLOCK)
/*
* Options passed to sx_init_flags().
Modified: projects/calloutng/sys/sys/systm.h
==============================================================================
--- projects/calloutng/sys/sys/systm.h Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/sys/systm.h Sun Mar 3 09:13:17 2013 (r247699)
@@ -344,21 +344,21 @@ int _sleep(void *chan, struct lock_objec
sbintime_t sbt, sbintime_t pr, int flags) __nonnull(1);
#define msleep(chan, mtx, pri, wmesg, timo) \
_sleep((chan), &(mtx)->lock_object, (pri), (wmesg), \
- (tick_sbt * (timo)), 0, C_HARDCLOCK)
+ tick_sbt * (timo), 0, C_HARDCLOCK)
#define msleep_sbt(chan, mtx, pri, wmesg, bt, pr, flags) \
_sleep((chan), &(mtx)->lock_object, (pri), (wmesg), (bt), (pr), \
(flags))
int msleep_spin_sbt(void *chan, struct mtx *mtx, const char *wmesg,
sbintime_t sbt, sbintime_t pr, int flags) __nonnull(1);
#define msleep_spin(chan, mtx, wmesg, timo) \
- msleep_spin_sbt((chan), (mtx), (wmesg), (tick_sbt * (timo)), \
+ msleep_spin_sbt((chan), (mtx), (wmesg), tick_sbt * (timo), \
0, C_HARDCLOCK)
int pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_t pr,
int flags);
#define pause(wmesg, timo) \
- pause_sbt((wmesg), (tick_sbt * (timo)), 0, C_HARDCLOCK)
+ pause_sbt((wmesg), tick_sbt * (timo), 0, C_HARDCLOCK)
#define tsleep(chan, pri, wmesg, timo) \
- _sleep((chan), NULL, (pri), (wmesg), (tick_sbt * (timo)), \
+ _sleep((chan), NULL, (pri), (wmesg), tick_sbt * (timo), \
0, C_HARDCLOCK)
#define tsleep_sbt(chan, pri, wmesg, bt, pr, flags) \
_sleep((chan), NULL, (pri), (wmesg), (bt), (pr), (flags))
Modified: projects/calloutng/sys/sys/time.h
==============================================================================
--- projects/calloutng/sys/sys/time.h Sun Mar 3 09:11:24 2013 (r247698)
+++ projects/calloutng/sys/sys/time.h Sun Mar 3 09:13:17 2013 (r247699)
@@ -154,13 +154,6 @@ sbttobt(sbintime_t sbt)
return (bt);
}
-#ifdef _KERNEL
-
-extern struct bintime tick_bt;
-extern sbintime_t tick_sbt;
-
-#endif /* KERNEL */
-
/*-
* Background information:
*
@@ -378,9 +371,11 @@ void resettodr(void);
extern volatile time_t time_second;
extern volatile time_t time_uptime;
extern struct bintime boottimebin;
+extern struct timeval boottime;
extern struct bintime tc_tick_bt;
extern sbintime_t tc_tick_sbt;
-extern struct timeval boottime;
+extern struct bintime tick_bt;
+extern sbintime_t tick_sbt;
extern int tc_precexp;
extern int tc_timepercentage;
extern struct bintime bt_timethreshold;
More information about the svn-src-projects
mailing list