[Glibc-bsd-commits] r4736 - in trunk/glibc-ports/kfreebsd: . bits

[Petr Salinger]

Author: ps-guest
Date: 2013-07-11 18:03:47 +0000 (Thu, 11 Jul 2013)
New Revision: 4736

Modified:
   trunk/glibc-ports/kfreebsd/bits/time.h
   trunk/glibc-ports/kfreebsd/clock_getres.c
   trunk/glibc-ports/kfreebsd/clock_gettime.c
   trunk/glibc-ports/kfreebsd/kernel-posix-cpu-timers.h
Log:
sync clock_id numbers with HEAD


Modified: trunk/glibc-ports/kfreebsd/bits/time.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/time.h	2013-07-11 18:02:11 UTC (rev 4735)
+++ trunk/glibc-ports/kfreebsd/bits/time.h	2013-07-11 18:03:47 UTC (rev 4736)
@@ -42,10 +42,6 @@
 #  ifdef __USE_POSIX199309
 /* Identifier for system-wide realtime clock.  */
 #   define CLOCK_REALTIME		0
-/* High-resolution timer from the CPU.  */
-#   define CLOCK_PROCESS_CPUTIME_ID	2
-/* Thread-specific CPU-time clock.  */
-#   define CLOCK_THREAD_CPUTIME_ID	3
 /* Monotonic system-wide clock.  */
 #   define CLOCK_MONOTONIC		4
 /* These are BSD specific clocks.  */
@@ -61,6 +57,10 @@
 #    define CLOCK_MONOTONIC_FAST    12      /* FreeBSD-specific. */
 #    define CLOCK_SECOND    13              /* FreeBSD-specific. */
 #   endif
+/* Thread-specific CPU-time clock.  */
+#   define CLOCK_THREAD_CPUTIME_ID	14
+/* High-resolution timer from the CPU.  */
+#   define CLOCK_PROCESS_CPUTIME_ID	15
 
 /* Flag to indicate time is absolute.  */
 #   define TIMER_RELTIME	0   /* relative timer */

Modified: trunk/glibc-ports/kfreebsd/clock_getres.c
===================================================================
--- trunk/glibc-ports/kfreebsd/clock_getres.c	2013-07-11 18:02:11 UTC (rev 4735)
+++ trunk/glibc-ports/kfreebsd/clock_getres.c	2013-07-11 18:03:47 UTC (rev 4736)
@@ -23,15 +23,16 @@
 
 # define SYSDEP_GETRES \
 	case CLOCK_REALTIME:		\
+	case CLOCK_VIRTUAL:		\
+	case CLOCK_PROF:		\
 	case CLOCK_MONOTONIC:		\
+	case CLOCK_UPTIME:		\
+	case CLOCK_UPTIME_PRECISE:	\
+	case CLOCK_UPTIME_FAST:		\
+	case CLOCK_REALTIME_PRECISE:	\
 	case CLOCK_REALTIME_FAST:	\
-	case CLOCK_REALTIME_PRECISE:	\
+	case CLOCK_MONOTONIC_PRECISE:	\
 	case CLOCK_MONOTONIC_FAST:	\
-	case CLOCK_MONOTONIC_PRECISE:	\
-	case CLOCK_UPTIME:		\
-	case CLOCK_UPTIME_FAST:		\
-	case CLOCK_UPTIME_PRECISE:	\
-	case CLOCK_VIRTUAL:		\
 	case CLOCK_SECOND:		\
     retval = INLINE_SYSCALL (clock_getres, 2, clock_id, res);		      \
     break

Modified: trunk/glibc-ports/kfreebsd/clock_gettime.c
===================================================================
--- trunk/glibc-ports/kfreebsd/clock_gettime.c	2013-07-11 18:02:11 UTC (rev 4735)
+++ trunk/glibc-ports/kfreebsd/clock_gettime.c	2013-07-11 18:03:47 UTC (rev 4736)
@@ -24,15 +24,16 @@
 
 # define SYSDEP_GETTIME \
 	case CLOCK_REALTIME:		\
+	case CLOCK_VIRTUAL:		\
+	case CLOCK_PROF:		\
 	case CLOCK_MONOTONIC:		\
+	case CLOCK_UPTIME:		\
+	case CLOCK_UPTIME_PRECISE:	\
+	case CLOCK_UPTIME_FAST:		\
+	case CLOCK_REALTIME_PRECISE:	\
 	case CLOCK_REALTIME_FAST:	\
-	case CLOCK_REALTIME_PRECISE:	\
+	case CLOCK_MONOTONIC_PRECISE:	\
 	case CLOCK_MONOTONIC_FAST:	\
-	case CLOCK_MONOTONIC_PRECISE:	\
-	case CLOCK_UPTIME:		\
-	case CLOCK_UPTIME_FAST:		\
-	case CLOCK_UPTIME_PRECISE:	\
-	case CLOCK_VIRTUAL:		\
 	case CLOCK_SECOND:		\
     retval = INLINE_SYSCALL (clock_gettime, 2, clock_id, tp);		      \
     break

Modified: trunk/glibc-ports/kfreebsd/kernel-posix-cpu-timers.h
===================================================================
--- trunk/glibc-ports/kfreebsd/kernel-posix-cpu-timers.h	2013-07-11 18:02:11 UTC (rev 4735)
+++ trunk/glibc-ports/kfreebsd/kernel-posix-cpu-timers.h	2013-07-11 18:03:47 UTC (rev 4736)
@@ -1,5 +1,5 @@
 /* Parameters for the FreeBSD kernel ABI for CPU clocks.  */
 
 #define CPUCLOCK_WHICH(clock)   ((clock) & (clockid_t) CPUCLOCK_CLOCK_MASK)
-#define CPUCLOCK_CLOCK_MASK     7
+#define CPUCLOCK_CLOCK_MASK     15