Fri Jun 9 01:16:33 2017 UTC ()

define a copy of getnanotime() named dtrace_getnanotime() so that
dtrace can know from the name that it should not allow setting
fbt probes on it.  needed by dtrace.


(chs)

diff -r1.46 -r1.47 src/sys/kern/kern_tc.c

--- src/sys/kern/kern_tc.c 2013/09/14 20:52:43	1.46
+++ src/sys/kern/kern_tc.c 2017/06/09 01:16:33	1.47

 @@ -1,14 +1,14 @@
-/* $NetBSD: kern_tc.c,v 1.46 2013/09/14 20:52:43 martin Exp $ */
+/* $NetBSD: kern_tc.c,v 1.47 2017/06/09 01:16:33 chs Exp $ */
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,27 +30,27 @@
  */
 /*-
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
  * can do whatever you want with this stuff. If we meet some day, and you think
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ---------------------------------------------------------------------------
  */
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.166 2005/09/19 22:16:31 andre Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_tc.c,v 1.46 2013/09/14 20:52:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_tc.c,v 1.47 2017/06/09 01:16:33 chs Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ntp.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>	/* XXX just to get AB_VERBOSE */
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/timepps.h>
 #include <sys/timetc.h>
 @@ -460,41 +460,57 @@ getbintime(struct bintime *bt)
+{
 	struct timehands *th;
 	u_int gen;
 	TC_COUNT(ngetbintime);
 	do {
 		th = timehands;
 		gen = th->th_generation;
 		*bt = th->th_offset;
 	} while (gen == 0 || gen != th->th_generation);
 	bintime_add(bt, &timebasebin);
+}
-void
+static inline void
-getnanotime(struct timespec *tsp)
+dogetnanotime(struct timespec *tsp)
+{
 	struct timehands *th;
 	u_int gen;
 	TC_COUNT(ngetnanotime);
 	do {
 		th = timehands;
 		gen = th->th_generation;
 		*tsp = th->th_nanotime;
 	} while (gen == 0 || gen != th->th_generation);
+}
 void
 getnanotime(struct timespec *tsp)
+{
 	dogetnanotime(tsp);
+}
 void dtrace_getnanotime(struct timespec *tsp);
 void
 dtrace_getnanotime(struct timespec *tsp)
+{
 	dogetnanotime(tsp);
+}
 void
 getmicrotime(struct timeval *tvp)
+{
 	struct timehands *th;
 	u_int gen;
 	TC_COUNT(ngetmicrotime);
 	do {
 		th = timehands;
 		gen = th->th_generation;
 		*tvp = th->th_microtime;
 	} while (gen == 0 || gen != th->th_generation);
+}