aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lepore <ian@FreeBSD.org>2018-02-12 16:25:56 +0000
committerIan Lepore <ian@FreeBSD.org>2018-02-12 16:25:56 +0000
commitaedc51f11adb0f977dea9c3092eabebec2c3fe07 (patch)
treecc405911abb16f525265525e59aa38d6a4d25279
parent5ec69a1509ad10d68b93577b64f214eb80259bc4 (diff)
downloadsrc-aedc51f11adb0f977dea9c3092eabebec2c3fe07.tar.gz
src-aedc51f11adb0f977dea9c3092eabebec2c3fe07.zip
Replace the existing print_ct() private debugging function with a set of
three public functions to format and print the three major data structures used by realtime clock drivers (clocktime, bcd_clocktime, and timespec).
Notes
Notes: svn path=/head/; revision=329170
-rw-r--r--sys/kern/subr_clock.c73
-rw-r--r--sys/sys/clock.h9
2 files changed, 68 insertions, 14 deletions
diff --git a/sys/kern/subr_clock.c b/sys/kern/subr_clock.c
index 0458b5e0d7b4..fa72e5425d1f 100644
--- a/sys/kern/subr_clock.c
+++ b/sys/kern/subr_clock.c
@@ -108,6 +108,14 @@ static const int recent_base_year = 2017;
static const int recent_base_days = 17167;
/*
+ * Table to 'calculate' pow(10, 9 - nsdigits) via lookup of nsdigits.
+ * Before doing the lookup, the code asserts 0 <= nsdigits <= 9.
+ */
+static u_int nsdivisors[] = {
+ 1000000000, 100000000, 10000000, 1000000, 100000, 10000, 1000, 100, 10, 1
+};
+
+/*
* This inline avoids some unnecessary modulo operations
* as compared with the usual macro:
* ( ((year % 4) == 0 &&
@@ -131,23 +139,15 @@ leapyear(int year)
return (rv);
}
-static void
-print_ct(const struct clocktime *ct)
-{
- printf("[%04d-%02d-%02d %02d:%02d:%02d]",
- ct->year, ct->mon, ct->day,
- ct->hour, ct->min, ct->sec);
-}
-
int
clock_ct_to_ts(const struct clocktime *ct, struct timespec *ts)
{
int i, year, days;
if (ct_debug) {
- printf("ct_to_ts(");
- print_ct(ct);
- printf(")");
+ printf("ct_to_ts([");
+ clock_print_ct(ct, 9);
+ printf("])");
}
/*
@@ -288,10 +288,10 @@ clock_ts_to_ct(const struct timespec *ts, struct clocktime *ct)
ct->sec = rsec;
ct->nsec = ts->tv_nsec;
if (ct_debug) {
- printf("ts_to_ct(%jd.%09ld) = ",
+ printf("ts_to_ct(%jd.%09ld) = [",
(intmax_t)ts->tv_sec, ts->tv_nsec);
- print_ct(ct);
- printf("\n");
+ clock_print_ct(ct, 9);
+ printf("]\n");
}
KASSERT(ct->year >= 0 && ct->year < 10000,
@@ -337,6 +337,51 @@ clock_ts_to_bcd(const struct timespec *ts, struct bcd_clocktime *bct, bool ampm)
bct->nsec = ct.nsec;
}
+void
+clock_print_bcd(const struct bcd_clocktime *bct, int nsdigits)
+{
+
+ KASSERT(nsdigits >= 0 && nsdigits <= 9, ("bad nsdigits %d", nsdigits));
+
+ if (nsdigits > 0) {
+ printf("%4.4x-%2.2x-%2.2x %2.2x:%2.2x:%2.2x.%*.*ld",
+ bct->year, bct->mon, bct->day,
+ bct->hour, bct->min, bct->sec,
+ nsdigits, nsdigits, bct->nsec / nsdivisors[nsdigits]);
+ } else {
+ printf("%4.4x-%2.2x-%2.2x %2.2x:%2.2x:%2.2x",
+ bct->year, bct->mon, bct->day,
+ bct->hour, bct->min, bct->sec);
+ }
+}
+
+void
+clock_print_ct(const struct clocktime *ct, int nsdigits)
+{
+
+ KASSERT(nsdigits >= 0 && nsdigits <= 9, ("bad nsdigits %d", nsdigits));
+
+ if (nsdigits > 0) {
+ printf("%04d-%02d-%02d %02d:%02d:%02d.%*.*ld",
+ ct->year, ct->mon, ct->day,
+ ct->hour, ct->min, ct->sec,
+ nsdigits, nsdigits, ct->nsec / nsdivisors[nsdigits]);
+ } else {
+ printf("%04d-%02d-%02d %02d:%02d:%02d",
+ ct->year, ct->mon, ct->day,
+ ct->hour, ct->min, ct->sec);
+ }
+}
+
+void
+clock_print_ts(const struct timespec *ts, int nsdigits)
+{
+ struct clocktime ct;
+
+ clock_ts_to_ct(ts, &ct);
+ clock_print_ct(&ct, nsdigits);
+}
+
int
utc_offset(void)
{
diff --git a/sys/sys/clock.h b/sys/sys/clock.h
index cb7503497c57..a5e89746d488 100644
--- a/sys/sys/clock.h
+++ b/sys/sys/clock.h
@@ -182,6 +182,15 @@ void timespec2fattime(const struct timespec *tsp, int utc, u_int16_t *ddp,
void fattime2timespec(unsigned dd, unsigned dt, unsigned dh, int utc,
struct timespec *tsp);
+/*
+ * Print a [bcd_]clocktime or timespec, optionally with fractional seconds. The
+ * nsdig argument can range from 0-9, and specifies how many decimal digits to
+ * display for fractional seconds.
+ */
+void clock_print_bcd(const struct bcd_clocktime *bct, int nsdig);
+void clock_print_ct(const struct clocktime *ct, int nsdig);
+void clock_print_ts(const struct timespec *ts, int nsdig);
+
#endif /* _KERNEL */
#endif /* !_SYS_CLOCK_H_ */