svn commit: r269466 - in head/sys/cddl: compat/opensolaris/sys contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Sun Aug  3 09:47:51 2014
New Revision: 269466
URL: http://svnweb.freebsd.org/changeset/base/269466

Log:
  Revert r269404 and use cpu_ticks() for dbuf allocation.
  
  Encode CPU's number by XOR'ing the CPU ID against the 64-bit cpu_ticks().
  
  Reviewed by:	mav, gibbs
  Differential Revision: https://phabric.freebsd.org/D521
  MFC after:	2 weeks

Modified:
  head/sys/cddl/compat/opensolaris/sys/time.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c

Modified: head/sys/cddl/compat/opensolaris/sys/time.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/time.h	Sun Aug  3 09:40:50 2014	(r269465)
+++ head/sys/cddl/compat/opensolaris/sys/time.h	Sun Aug  3 09:47:51 2014	(r269466)
@@ -60,17 +60,6 @@ gethrtime(void) {
 	struct timespec ts;
 	hrtime_t nsec;
 
-	nanouptime(&ts);
-	nsec = (hrtime_t)ts.tv_sec * NANOSEC + ts.tv_nsec;
-	return (nsec);
-}
-
-static __inline hrtime_t
-gethrtime_waitfree(void) {
-
-	struct timespec ts;
-	hrtime_t nsec;
-
 	getnanouptime(&ts);
 	nsec = (hrtime_t)ts.tv_sec * NANOSEC + ts.tv_nsec;
 	return (nsec);
@@ -78,6 +67,7 @@ gethrtime_waitfree(void) {
 
 #define	gethrestime_sec()	(time_second)
 #define	gethrestime(ts)		getnanotime(ts)
+#define	gethrtime_waitfree()	gethrtime()
 
 extern int nsec_per_tick;	/* nanoseconds per clock tick */
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Sun Aug  3 09:40:50 2014	(r269465)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Sun Aug  3 09:47:51 2014	(r269466)
@@ -70,7 +70,11 @@ dbuf_cons(void *vdb, void *unused, int k
 	cv_init(&db->db_changed, NULL, CV_DEFAULT, NULL);
 	refcount_create(&db->db_holds);
 
+#if defined(illumos) || !defined(_KERNEL)
 	db->db_creation = gethrtime();
+#else
+	db->db_creation = cpu_ticks() ^ ((uint64_t)CPU_SEQID << 48);
+#endif
 
 	return (0);
 }