D28723.id84060.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28723.id84060.diff
View Options

	Index: sys/cddl/dev/dtrace/aarch64/dtrace_subr.c
	===================================================================
	--- sys/cddl/dev/dtrace/aarch64/dtrace_subr.c
	+++ sys/cddl/dev/dtrace/aarch64/dtrace_subr.c
	@@ -153,23 +153,26 @@
	}

	/*
	- * DTrace needs a high resolution time function which can
	- * be called from a probe context and guaranteed not to have
	- * instrumented with probes itself.
	+ * DTrace needs a high resolution time function which can be called from a
	+ * probe context and guaranteed not to have instrumented with probes itself.
	*
	- * Returns nanoseconds since boot.
	+ * Returns nanoseconds since some arbitrary point in time (likely SoC reset?).
	*/
	uint64_t
	-dtrace_gethrtime()
	+dtrace_gethrtime(void)
	{
	- struct timespec curtime;
	-
	- dtrace_getnanouptime(&curtime);
	-
	- return (curtime.tv_sec * 1000000000UL + curtime.tv_nsec);
	+ uint64_t cyclecount, freq;

	+ cyclecount = READ_SPECIALREG(cntvct_el0);
	+ freq = READ_SPECIALREG(cntfrq_el0);
	+ return ((1000000000UL * cyclecount) / freq);
	}

	+/*
	+ * Return a much lower resolution wallclock time based on the system clock
	+ * updated by the timer. If needed, we could add a version interpolated from
	+ * the cycle counter, if that's desirable.
	+ */
	uint64_t
	dtrace_gethrestime(void)
	{