selftests:timers: remove local CLOCKID defines

timers tests defines CLOCKIDs locally. Remove all local CLOCKIDs except
CLOCK_HWSPECIFIC and use defines from time.h header file.

CLOCK_HWSPECIFIC and CLOCK_SGI_CYCLE are the same and CLOCK_SGI_CYCLE
is deprecated,

Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Acked-by: John Stultz <jstultz@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/timers/adjtick.c b/tools/testing/selftests/timers/adjtick.c
index cb9a30f546625d62515ae2e2086a5faac5b0135e..777d9494b683f8ec3d7a4d3c356c83e9711aaa5c 100644 (file)
--- a/tools/testing/selftests/timers/adjtick.c
+++ b/tools/testing/selftests/timers/adjtick.c
@@ -26,8 +26,6 @@
 
 #include "../kselftest.h"
 
-#define CLOCK_MONOTONIC_RAW    4
-
 #define MILLION                        1000000
 
 long systick;

diff --git a/tools/testing/selftests/timers/alarmtimer-suspend.c b/tools/testing/selftests/timers/alarmtimer-suspend.c
index 9877158a085315fdb0ae560e2274a0f267585cad..a9ef76ea605152f9072f787ba3b2c4db518f4901 100644 (file)
--- a/tools/testing/selftests/timers/alarmtimer-suspend.c
+++ b/tools/testing/selftests/timers/alarmtimer-suspend.c
@@ -32,21 +32,6 @@
 #include <errno.h>
 #include "../kselftest.h"
 
-#define CLOCK_REALTIME                 0
-#define CLOCK_MONOTONIC                        1
-#define CLOCK_PROCESS_CPUTIME_ID       2
-#define CLOCK_THREAD_CPUTIME_ID                3
-#define CLOCK_MONOTONIC_RAW            4
-#define CLOCK_REALTIME_COARSE          5
-#define CLOCK_MONOTONIC_COARSE         6
-#define CLOCK_BOOTTIME                 7
-#define CLOCK_REALTIME_ALARM           8
-#define CLOCK_BOOTTIME_ALARM           9
-#define CLOCK_HWSPECIFIC               10
-#define CLOCK_TAI                      11
-#define NR_CLOCKIDS                    12
-
-
 #define UNREASONABLE_LAT (NSEC_PER_SEC * 5) /* hopefully we resume in 5 secs */
 
 #define SUSPEND_SECS 15

diff --git a/tools/testing/selftests/timers/inconsistency-check.c b/tools/testing/selftests/timers/inconsistency-check.c
index 75650cf0503f64840d3711ba08a9a2f2c9dfac50..9d1573769d55834c83d94b35ef2d51c6226709e9 100644 (file)
--- a/tools/testing/selftests/timers/inconsistency-check.c
+++ b/tools/testing/selftests/timers/inconsistency-check.c
@@ -31,21 +31,10 @@
 #include <include/vdso/time64.h>
 #include "../kselftest.h"
 
-#define CALLS_PER_LOOP 64
-
-#define CLOCK_REALTIME                 0
-#define CLOCK_MONOTONIC                        1
-#define CLOCK_PROCESS_CPUTIME_ID       2
-#define CLOCK_THREAD_CPUTIME_ID                3
-#define CLOCK_MONOTONIC_RAW            4
-#define CLOCK_REALTIME_COARSE          5
-#define CLOCK_MONOTONIC_COARSE         6
-#define CLOCK_BOOTTIME                 7
-#define CLOCK_REALTIME_ALARM           8
-#define CLOCK_BOOTTIME_ALARM           9
+/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
 #define CLOCK_HWSPECIFIC               10
-#define CLOCK_TAI                      11
-#define NR_CLOCKIDS                    12
+
+#define CALLS_PER_LOOP 64
 
 char *clockstring(int clockid)
 {
@@ -152,7 +141,7 @@ int main(int argc, char *argv[])
 {
        int clockid, opt;
        int userclock = CLOCK_REALTIME;
-       int maxclocks = NR_CLOCKIDS;
+       int maxclocks = CLOCK_TAI + 1;
        int runtime = 10;
        struct timespec ts;
 

diff --git a/tools/testing/selftests/timers/nanosleep.c b/tools/testing/selftests/timers/nanosleep.c
index 9a354e38a569660603132451e5c0fe10efba4614..252c6308c5698f9094b8bdc39c284077b5d55531 100644 (file)
--- a/tools/testing/selftests/timers/nanosleep.c
+++ b/tools/testing/selftests/timers/nanosleep.c
@@ -30,19 +30,8 @@
 #include <include/vdso/time64.h>
 #include "../kselftest.h"
 
-#define CLOCK_REALTIME                 0
-#define CLOCK_MONOTONIC                        1
-#define CLOCK_PROCESS_CPUTIME_ID       2
-#define CLOCK_THREAD_CPUTIME_ID                3
-#define CLOCK_MONOTONIC_RAW            4
-#define CLOCK_REALTIME_COARSE          5
-#define CLOCK_MONOTONIC_COARSE         6
-#define CLOCK_BOOTTIME                 7
-#define CLOCK_REALTIME_ALARM           8
-#define CLOCK_BOOTTIME_ALARM           9
+/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
 #define CLOCK_HWSPECIFIC               10
-#define CLOCK_TAI                      11
-#define NR_CLOCKIDS                    12
 
 #define UNSUPPORTED 0xf00f
 
@@ -131,11 +120,12 @@ int main(int argc, char **argv)
 {
        long long length;
        int clockid, ret;
+       int max_clocks = CLOCK_TAI + 1;
 
        ksft_print_header();
-       ksft_set_plan(NR_CLOCKIDS);
+       ksft_set_plan(max_clocks);
 
-       for (clockid = CLOCK_REALTIME; clockid < NR_CLOCKIDS; clockid++) {
+       for (clockid = CLOCK_REALTIME; clockid < max_clocks; clockid++) {
 
                /* Skip cputime clockids since nanosleep won't increment cputime */
                if (clockid == CLOCK_PROCESS_CPUTIME_ID ||

diff --git a/tools/testing/selftests/timers/nsleep-lat.c b/tools/testing/selftests/timers/nsleep-lat.c
index f6a99490b291523c1e80eba04c5941d0f3c5e353..de23dc0c9f973d2cb9e94db64fed4481cc8e66e1 100644 (file)
--- a/tools/testing/selftests/timers/nsleep-lat.c
+++ b/tools/testing/selftests/timers/nsleep-lat.c
@@ -29,20 +29,8 @@
 
 #define UNRESONABLE_LATENCY 40000000 /* 40ms in nanosecs */
 
-
-#define CLOCK_REALTIME                 0
-#define CLOCK_MONOTONIC                        1
-#define CLOCK_PROCESS_CPUTIME_ID       2
-#define CLOCK_THREAD_CPUTIME_ID                3
-#define CLOCK_MONOTONIC_RAW            4
-#define CLOCK_REALTIME_COARSE          5
-#define CLOCK_MONOTONIC_COARSE         6
-#define CLOCK_BOOTTIME                 7
-#define CLOCK_REALTIME_ALARM           8
-#define CLOCK_BOOTTIME_ALARM           9
+/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
 #define CLOCK_HWSPECIFIC               10
-#define CLOCK_TAI                      11
-#define NR_CLOCKIDS                    12
 
 #define UNSUPPORTED 0xf00f
 
@@ -144,11 +132,12 @@ int main(int argc, char **argv)
 {
        long long length;
        int clockid, ret;
+       int max_clocks = CLOCK_TAI + 1;
 
        ksft_print_header();
-       ksft_set_plan(NR_CLOCKIDS - CLOCK_REALTIME - SKIPPED_CLOCK_COUNT);
+       ksft_set_plan(max_clocks - CLOCK_REALTIME - SKIPPED_CLOCK_COUNT);
 
-       for (clockid = CLOCK_REALTIME; clockid < NR_CLOCKIDS; clockid++) {
+       for (clockid = CLOCK_REALTIME; clockid < max_clocks; clockid++) {
 
                /* Skip cputime clockids since nanosleep won't increment cputime */
                if (clockid == CLOCK_PROCESS_CPUTIME_ID ||

diff --git a/tools/testing/selftests/timers/raw_skew.c b/tools/testing/selftests/timers/raw_skew.c
index ea50e4efc422cadb6ee5db00958173a9650754c3..957f7cd29cb19ab140b82e014dacddae908f2c16 100644 (file)
--- a/tools/testing/selftests/timers/raw_skew.c
+++ b/tools/testing/selftests/timers/raw_skew.c
@@ -28,8 +28,6 @@
 #include <include/vdso/time64.h>
 #include "../kselftest.h"
 
-#define CLOCK_MONOTONIC_RAW            4
-
 #define shift_right(x, s) ({           \
        __typeof__(x) __x = (x);        \
        __typeof__(s) __s = (s);        \

diff --git a/tools/testing/selftests/timers/set-timer-lat.c b/tools/testing/selftests/timers/set-timer-lat.c
index 7a1a2382538cc0eea021c70b89d49548143b0fb6..9d8437c13929a823d820fad0e77c5edd7b8626c3 100644 (file)
--- a/tools/testing/selftests/timers/set-timer-lat.c
+++ b/tools/testing/selftests/timers/set-timer-lat.c
@@ -31,19 +31,8 @@
 #include <include/vdso/time64.h>
 #include "../kselftest.h"
 
-#define CLOCK_REALTIME                 0
-#define CLOCK_MONOTONIC                        1
-#define CLOCK_PROCESS_CPUTIME_ID       2
-#define CLOCK_THREAD_CPUTIME_ID                3
-#define CLOCK_MONOTONIC_RAW            4
-#define CLOCK_REALTIME_COARSE          5
-#define CLOCK_MONOTONIC_COARSE         6
-#define CLOCK_BOOTTIME                 7
-#define CLOCK_REALTIME_ALARM           8
-#define CLOCK_BOOTTIME_ALARM           9
+/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
 #define CLOCK_HWSPECIFIC               10
-#define CLOCK_TAI                      11
-#define NR_CLOCKIDS                    12
 
 #define UNRESONABLE_LATENCY 40000000 /* 40ms in nanosecs */
 
@@ -253,6 +242,7 @@ int main(void)
        struct sigaction act;
        int signum = SIGRTMAX;
        int ret = 0;
+       int max_clocks = CLOCK_TAI + 1;
 
        /* Set up signal handler: */
        sigfillset(&act.sa_mask);
@@ -261,7 +251,7 @@ int main(void)
        sigaction(signum, &act, NULL);
 
        printf("Setting timers for every %i seconds\n", TIMER_SECS);
-       for (clock_id = 0; clock_id < NR_CLOCKIDS; clock_id++) {
+       for (clock_id = 0; clock_id < max_clocks; clock_id++) {
 
                if ((clock_id == CLOCK_PROCESS_CPUTIME_ID) ||
                                (clock_id == CLOCK_THREAD_CPUTIME_ID) ||