From: Lukasz Majewski <lukma@denx.de>
To: Joseph Myers <joseph@codesourcery.com>,
Paul Eggert <eggert@cs.ucla.edu>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: Alistair Francis <alistair23@gmail.com>,
Alistair Francis <alistair.francis@wdc.com>,
GNU C Library <libc-alpha@sourceware.org>,
Siddhesh Poyarekar <siddhesh@gotplt.org>,
Florian Weimer <fweimer@redhat.com>,
Zack Weinberg <zackw@panix.com>,
Carlos O'Donell <carlos@redhat.com>,
Andreas Schwab <schwab@suse.de>, Lukasz Majewski <lukma@denx.de>
Subject: [RFC 05/12] y2038: Rename xclock_now to __xclock_now
Date: Mon, 1 Jun 2020 16:07:33 +0200 [thread overview]
Message-ID: <20200601140740.16371-6-lukma@denx.de> (raw)
In-Reply-To: <20200601140740.16371-1-lukma@denx.de>
As the xclock_now is used locally in glibc, its name shall begin with
"__". This change adds this prefix.
Tested with glibc/glibc-many-build --keep failed glibcs
---
nptl/tst-eintr2.c | 2 +-
nptl/tst-eintr5.c | 2 +-
support/xtime.h | 2 +-
sysdeps/pthread/tst-cond27.c | 2 +-
sysdeps/pthread/tst-join3.c | 4 ++--
sysdeps/pthread/tst-join5.c | 6 +++---
sysdeps/pthread/tst-mutex5.c | 6 +++---
sysdeps/pthread/tst-mutex9.c | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/nptl/tst-eintr2.c b/nptl/tst-eintr2.c
index eba8065236..68a8453f34 100644
--- a/nptl/tst-eintr2.c
+++ b/nptl/tst-eintr2.c
@@ -37,7 +37,7 @@ static pthread_mutex_t m2 = PTHREAD_MUTEX_INITIALIZER;
static void *
tf1 (void *arg)
{
- struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME),
+ struct timespec ts = timespec_add (__xclock_now (CLOCK_REALTIME),
__make_timespec (10000, 0));
/* This call must never return. */
diff --git a/nptl/tst-eintr5.c b/nptl/tst-eintr5.c
index 4edfbaaef6..3130f0fa08 100644
--- a/nptl/tst-eintr5.c
+++ b/nptl/tst-eintr5.c
@@ -38,7 +38,7 @@ static pthread_cond_t c = PTHREAD_COND_INITIALIZER;
static void *
tf (void *arg)
{
- struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME),
+ struct timespec ts = timespec_add (__xclock_now (CLOCK_REALTIME),
__make_timespec (10000, 0));
/* This call must never return. */
diff --git a/support/xtime.h b/support/xtime.h
index 0912ead0ec..0fce19a78d 100644
--- a/support/xtime.h
+++ b/support/xtime.h
@@ -32,7 +32,7 @@ void __xclock_gettime (clockid_t clock, struct timespec *ts);
/* This helper can often simplify tests by avoiding an explicit
variable declaration or allowing that declaration to be const. */
-static inline struct timespec xclock_now (clockid_t clock)
+static inline struct timespec __xclock_now (clockid_t clock)
{
struct timespec ts;
__xclock_gettime (clock, &ts);
diff --git a/sysdeps/pthread/tst-cond27.c b/sysdeps/pthread/tst-cond27.c
index 3d7b8240b1..5755d25ec8 100644
--- a/sysdeps/pthread/tst-cond27.c
+++ b/sysdeps/pthread/tst-cond27.c
@@ -40,7 +40,7 @@ do_test_clock (clockid_t clockid)
xpthread_mutex_lock (&mut);
/* Waiting for the condition will fail. But we want the timeout here. */
- const struct timespec ts_now = xclock_now (clockid);
+ const struct timespec ts_now = __xclock_now (clockid);
const struct timespec ts_timeout =
timespec_add (ts_now, __make_timespec (0, 500000000));
diff --git a/sysdeps/pthread/tst-join3.c b/sysdeps/pthread/tst-join3.c
index fc54f12cc9..76df44c49e 100644
--- a/sysdeps/pthread/tst-join3.c
+++ b/sysdeps/pthread/tst-join3.c
@@ -53,7 +53,7 @@ do_test_clock (clockid_t clockid)
pthread_t th = xpthread_create (NULL, tf, NULL);
void *status;
- struct timespec timeout = timespec_add (xclock_now (clockid_for_get),
+ struct timespec timeout = timespec_add (__xclock_now (clockid_for_get),
__make_timespec (0, 200000000));
int val;
@@ -68,7 +68,7 @@ do_test_clock (clockid_t clockid)
while (1)
{
- timeout = timespec_add (xclock_now (clockid_for_get),
+ timeout = timespec_add (__xclock_now (clockid_for_get),
__make_timespec (0, 200000000));
if (clockid == CLOCK_USE_TIMEDJOIN)
diff --git a/sysdeps/pthread/tst-join5.c b/sysdeps/pthread/tst-join5.c
index 525f349a4b..a72760a9ff 100644
--- a/sysdeps/pthread/tst-join5.c
+++ b/sysdeps/pthread/tst-join5.c
@@ -45,15 +45,15 @@ static int
thread_join (pthread_t thread, void **retval)
{
#if defined USE_PTHREAD_TIMEDJOIN_NP
- const struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME),
+ const struct timespec ts = timespec_add (__xclock_now (CLOCK_REALTIME),
__make_timespec (1000, 0));
return pthread_timedjoin_np (thread, retval, &ts);
#elif defined USE_PTHREAD_CLOCKJOIN_NP_REALTIME
- const struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME),
+ const struct timespec ts = timespec_add (__xclock_now (CLOCK_REALTIME),
__make_timespec (1000, 0));
return pthread_clockjoin_np (thread, retval, CLOCK_REALTIME, &ts);
#elif defined USE_PTHREAD_CLOCKJOIN_NP_MONOTONIC
- const struct timespec ts = timespec_add (xclock_now (CLOCK_MONOTONIC),
+ const struct timespec ts = timespec_add (__xclock_now (CLOCK_MONOTONIC),
__make_timespec (1000, 0));
return pthread_clockjoin_np (thread, retval, CLOCK_MONOTONIC, &ts);
#else
diff --git a/sysdeps/pthread/tst-mutex5.c b/sysdeps/pthread/tst-mutex5.c
index 72fdbdaea5..86f383a193 100644
--- a/sysdeps/pthread/tst-mutex5.c
+++ b/sysdeps/pthread/tst-mutex5.c
@@ -67,7 +67,7 @@ do_test_clock (clockid_t clockid, const char *fnname)
FAIL_EXIT1 ("mutex_trylock succeeded");
/* Wait 2 seconds. */
- struct timespec ts_timeout = timespec_add (xclock_now (clockid_for_get),
+ struct timespec ts_timeout = timespec_add (__xclock_now (clockid_for_get),
__make_timespec (2, 0));
if (clockid == CLOCK_USE_TIMEDLOCK)
@@ -86,7 +86,7 @@ do_test_clock (clockid_t clockid, const char *fnname)
TEST_COMPARE (pthread_mutex_clocklock (&m, clockid, &ts_timeout), EINVAL);
TEST_COMPARE (pthread_mutex_unlock (&m), 0);
- const struct timespec ts_start = xclock_now (CLOCK_REALTIME);
+ const struct timespec ts_start = __xclock_now (CLOCK_REALTIME);
/* Wait 2 seconds. */
ts_timeout = timespec_add (ts_start, __make_timespec (2, 0));
@@ -96,7 +96,7 @@ do_test_clock (clockid_t clockid, const char *fnname)
else
TEST_COMPARE (pthread_mutex_clocklock (&m, clockid, &ts_timeout), 0);
- const struct timespec ts_end = xclock_now (clockid_for_get);
+ const struct timespec ts_end = __xclock_now (clockid_for_get);
/* Check that timedlock didn't delay. We use a limit of 0.1 secs. */
TEST_TIMESPEC_BEFORE (ts_end,
diff --git a/sysdeps/pthread/tst-mutex9.c b/sysdeps/pthread/tst-mutex9.c
index d03a22b97a..20e6d8d009 100644
--- a/sysdeps/pthread/tst-mutex9.c
+++ b/sysdeps/pthread/tst-mutex9.c
@@ -101,7 +101,7 @@ do_test_clock (clockid_t clockid)
if (pthread_mutex_unlock (m) == 0)
FAIL_EXIT1 ("child: mutex_unlock succeeded");
- const struct timespec ts = timespec_add (xclock_now (clockid_for_get),
+ const struct timespec ts = timespec_add (__xclock_now (clockid_for_get),
__make_timespec (0, 500000000));
if (clockid == CLOCK_USE_TIMEDLOCK)
--
2.20.1
next prev parent reply other threads:[~2020-06-01 14:08 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 14:07 [RFC 00/12] [RFC] y2038: Convert timespec_{sub|add|create} in support to be Y2038 safe Lukasz Majewski
2020-06-01 14:07 ` [RFC 01/12] doc: Fix wording and formattine in ./support/README Lukasz Majewski
2020-06-01 14:07 ` [RFC 02/12] y2038: Rename timespec_compare to __timespec_compare Lukasz Majewski
2020-06-01 14:07 ` [RFC 03/12] y2038: Rename make_timespec to __make_timespec Lukasz Majewski
2020-06-01 14:07 ` [RFC 04/12] y2038: Rename xclock_gettime to __xclock_gettime Lukasz Majewski
2020-06-01 14:07 ` Lukasz Majewski [this message]
2020-06-01 14:07 ` [RFC 06/12] y2038: Rename timespec_sub to __timespec_sub Lukasz Majewski
2020-06-01 14:07 ` [RFC 07/12] y2038: Rename timespec_add to __timespec_add Lukasz Majewski
2020-06-01 14:07 ` [RFC 08/12] y2038: Convert __make_timespec to be Y2038 safe Lukasz Majewski
2020-06-01 14:07 ` [RFC 09/12] y2038: Convert __xclock_gettime " Lukasz Majewski
2020-06-01 14:07 ` [RFC 10/12] y2038: Convert __xclock_now " Lukasz Majewski
2020-06-01 14:07 ` [RFC 11/12] y2038: Convert timespec* files in ./support " Lukasz Majewski
2020-06-01 14:07 ` [RFC 12/12] y2038: Convert timespec_* from posix-timer.h " Lukasz Majewski
2020-06-02 18:05 ` [RFC 00/12] [RFC] y2038: Convert timespec_{sub|add|create} in support " Joseph Myers
2020-06-03 11:42 ` Lukasz Majewski
2020-06-03 12:53 ` [Y2038] Replacement of struct timespec with struct __timespec64 in glibc internal code Lukasz Majewski
2020-06-03 17:28 ` Joseph Myers
2020-06-03 20:45 ` Lukasz Majewski
2020-06-24 12:26 ` Lukasz Majewski
2020-06-24 12:43 ` Andreas Schwab
2020-06-24 20:39 ` Lukasz Majewski
2020-06-24 22:10 ` Joseph Myers
2020-06-24 17:43 ` Joseph Myers
2020-06-08 22:23 ` Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200601140740.16371-6-lukma@denx.de \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=carlos@redhat.com \
--cc=eggert@cs.ucla.edu \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=schwab@suse.de \
--cc=siddhesh@gotplt.org \
--cc=zackw@panix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).