X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Farch%2Fgeneric.h;h=c02a6a9930d0b7126c24ac633b5995cfe18e6546;hb=d3d3857f678627e7bbfb5a8d6f3bc15cd2a694d9;hp=4b56ed7aaff00788a5fb4fbce712a146c5198a5d;hpb=6893800a4d1cc14dff0395ddcd660a5138db183d;p=userspace-rcu.git

diff --git a/include/urcu/arch/generic.h b/include/urcu/arch/generic.h
index 4b56ed7..c02a6a9 100644
--- a/include/urcu/arch/generic.h
+++ b/include/urcu/arch/generic.h
@@ -1,24 +1,12 @@
+// SPDX-FileCopyrightText: 2010 Paolo Bonzini <pbonzini@redhat.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #ifndef _URCU_ARCH_GENERIC_H
 #define _URCU_ARCH_GENERIC_H
 
 /*
  * arch_generic.h: common definitions for multiple architectures.
- *
- * Copyright (c) 2010 Paolo Bonzini <pbonzini@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <urcu/compiler.h>
@@ -153,8 +141,11 @@ extern "C" {
 #ifndef HAS_CAA_GET_CYCLES
 #define HAS_CAA_GET_CYCLES
 
-#ifdef CONFIG_RCU_HAVE_CLOCK_GETTIME
+#if defined(__APPLE__)
 
+#include <mach/mach.h>
+#include <mach/clock.h>
+#include <mach/mach_time.h>
 #include <time.h>
 #include <stdint.h>
 
@@ -162,18 +153,21 @@ typedef uint64_t caa_cycles_t;
 
 static inline caa_cycles_t caa_get_cycles (void)
 {
-	struct timespec ts;
+	mach_timespec_t ts = { 0, 0 };
+	static clock_serv_t clock_service;
 
-	if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts)))
+	if (caa_unlikely(!clock_service)) {
+		if (host_get_clock_service(mach_host_self(),
+				SYSTEM_CLOCK, &clock_service))
+			return -1ULL;
+	}
+	if (caa_unlikely(clock_get_time(clock_service, &ts)))
 		return -1ULL;
 	return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
 }
 
-#elif defined(__APPLE__)
+#elif defined(CONFIG_RCU_HAVE_CLOCK_GETTIME)
 
-#include <mach/mach.h>
-#include <mach/clock.h>
-#include <mach/mach_time.h>
 #include <time.h>
 #include <stdint.h>
 
@@ -181,15 +175,9 @@ typedef uint64_t caa_cycles_t;
 
 static inline caa_cycles_t caa_get_cycles (void)
 {
-	mach_timespec_t ts = { 0, 0 };
-	static clock_serv_t clock_service;
+	struct timespec ts;
 
-	if (caa_unlikely(!clock_service)) {
-		if (host_get_clock_service(mach_host_self(),
-				SYSTEM_CLOCK, &clock_service))
-			return -1ULL;
-	}
-	if (caa_unlikely(clock_get_time(clock_service, &ts)))
+	if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts)))
 		return -1ULL;
 	return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
 }