Skip to content

Commit 62fe712

Browse files
committed
lib: Fix clock_gettime linking problems.
Until glibc 2.17 clock_* calls needed explicit -lrt and hence linking with -lltp fails on older distributions. Since we do not want to link whole LTP with -lrt this commit adds simple internal functions for clock_gettime() and clock_getres() calls to be used internally in the test library. Signed-off-by: Cyril Hrubis <[email protected]> Acked-by: Jan Stancek <[email protected]>
1 parent e23731f commit 62fe712

File tree

3 files changed

+73
-6
lines changed

3 files changed

+73
-6
lines changed

include/tst_clocks.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright (c) 2017 Cyril Hrubis <[email protected]>
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation, either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
18+
/*
19+
* clock_gettime() and clock_getres() functions
20+
*/
21+
22+
#ifndef TST_CLOCKS__
23+
#define TST_CLOCKS__
24+
25+
int tst_clock_getres(clockid_t clk_id, struct timespec *res);
26+
27+
int tst_clock_gettime(clockid_t clk_id, struct timespec *ts);
28+
29+
#endif /* TST_CLOCKS__ */

lib/tst_clocks.c

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Copyright (c) 2017 Cyril Hrubis <[email protected]>
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation, either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
18+
/*
19+
* clock_gettime() and clock_getres() functions
20+
*/
21+
22+
#define _GNU_SOURCE
23+
#include <unistd.h>
24+
#include <time.h>
25+
#include <sys/syscall.h>
26+
27+
#include "tst_clocks.h"
28+
29+
int tst_clock_getres(clockid_t clk_id, struct timespec *res)
30+
{
31+
return syscall(SYS_clock_getres, clk_id, res);
32+
}
33+
34+
int tst_clock_gettime(clockid_t clk_id, struct timespec *ts)
35+
{
36+
return syscall(SYS_clock_gettime, clk_id, ts);
37+
}

lib/tst_timer.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "test.h"
2727
#include "tst_timer.h"
28+
#include "tst_clocks.h"
2829
#include "lapi/posix_clocks.h"
2930

3031
static struct timespec start_time, stop_time;
@@ -56,30 +57,30 @@ static const char *clock_name(clockid_t clk_id)
5657

5758
void tst_timer_check(clockid_t clk_id)
5859
{
59-
if (clock_gettime(clk_id, &start_time)) {
60+
if (tst_clock_gettime(clk_id, &start_time)) {
6061
if (errno == EINVAL) {
6162
tst_brkm(TCONF, NULL,
6263
"Clock id %s(%u) not supported by kernel",
6364
clock_name(clk_id), clk_id);
6465
return;
6566
}
6667

67-
tst_brkm(TBROK | TERRNO, NULL, "clock_gettime() failed");
68+
tst_brkm(TBROK | TERRNO, NULL, "tst_clock_gettime() failed");
6869
}
6970
}
7071

7172
void tst_timer_start(clockid_t clk_id)
7273
{
7374
clock_id = clk_id;
7475

75-
if (clock_gettime(clock_id, &start_time))
76-
tst_resm(TWARN | TERRNO, "clock_gettime() failed");
76+
if (tst_clock_gettime(clock_id, &start_time))
77+
tst_resm(TWARN | TERRNO, "tst_clock_gettime() failed");
7778
}
7879

7980
void tst_timer_stop(void)
8081
{
81-
if (clock_gettime(clock_id, &stop_time))
82-
tst_resm(TWARN | TERRNO, "clock_gettime() failed");
82+
if (tst_clock_gettime(clock_id, &stop_time))
83+
tst_resm(TWARN | TERRNO, "tst_clock_gettime() failed");
8384
}
8485

8586
struct timespec tst_timer_elapsed(void)

0 commit comments

Comments
 (0)