From patchwork Mon Jun 1 14:07:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 39395 X-Patchwork-Delegate: l.majewski@majess.pl Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 741E0388A82B; Mon, 1 Jun 2020 14:08:05 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id C1944383F842 for ; Mon, 1 Jun 2020 14:08:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C1944383F842 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49bH7h6Hjnz1qsbM; Mon, 1 Jun 2020 16:08:00 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49bH7h5ylwz1qwwd; Mon, 1 Jun 2020 16:08:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id D3MfqDxIdfEM; Mon, 1 Jun 2020 16:07:58 +0200 (CEST) X-Auth-Info: as4n0riDIsEwsUZ9KYot+VxslfxgxgAbAjcpos9tBdM= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Mon, 1 Jun 2020 16:07:58 +0200 (CEST) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [RFC 03/12] y2038: Rename make_timespec to __make_timespec Date: Mon, 1 Jun 2020 16:07:31 +0200 Message-Id: <20200601140740.16371-4-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200601140740.16371-1-lukma@denx.de> References: <20200601140740.16371-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-21.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Weimer , GNU C Library , Andreas Schwab , Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" As the make_timespec 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 +- nptl/tst-rwlock6.c | 2 +- nptl/tst-rwlock7.c | 2 +- nptl/tst-sem17.c | 2 +- nptl/tst-sem5.c | 2 +- support/timespec-add.c | 2 +- support/timespec-sub.c | 2 +- support/timespec.h | 2 +- sysdeps/pthread/tst-cond26.c | 2 +- sysdeps/pthread/tst-cond27.c | 2 +- sysdeps/pthread/tst-join14.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 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nptl/tst-eintr2.c b/nptl/tst-eintr2.c index 4f26ccad04..eba8065236 100644 --- a/nptl/tst-eintr2.c +++ b/nptl/tst-eintr2.c @@ -38,7 +38,7 @@ static void * tf1 (void *arg) { struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME), - make_timespec (10000, 0)); + __make_timespec (10000, 0)); /* This call must never return. */ int e = pthread_mutex_timedlock (&m1, &ts); diff --git a/nptl/tst-eintr5.c b/nptl/tst-eintr5.c index bc6c0fef53..4edfbaaef6 100644 --- a/nptl/tst-eintr5.c +++ b/nptl/tst-eintr5.c @@ -39,7 +39,7 @@ static void * tf (void *arg) { struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME), - make_timespec (10000, 0)); + __make_timespec (10000, 0)); /* This call must never return. */ TEST_COMPARE (pthread_cond_timedwait (&c, &m, &ts), 0); diff --git a/nptl/tst-rwlock6.c b/nptl/tst-rwlock6.c index 36afa22da4..8714381a16 100644 --- a/nptl/tst-rwlock6.c +++ b/nptl/tst-rwlock6.c @@ -63,7 +63,7 @@ tf (void *arg) xclock_gettime (clockid_for_get, &ts_start); struct timespec ts_timeout = timespec_add (ts_start, - make_timespec (0, 300000000)); + __make_timespec (0, 300000000)); verbose_printf ("child calling %srdlock\n", fnname); diff --git a/nptl/tst-rwlock7.c b/nptl/tst-rwlock7.c index 1dcc4f0425..bdbfb5dac9 100644 --- a/nptl/tst-rwlock7.c +++ b/nptl/tst-rwlock7.c @@ -61,7 +61,7 @@ tf (void *arg) struct timespec ts_start; xclock_gettime (clockid_for_get, &ts_start); const struct timespec ts_timeout = timespec_add (ts_start, - make_timespec (0, 300000000)); + __make_timespec (0, 300000000)); if (clockid == CLOCK_USE_TIMEDLOCK) TEST_COMPARE (pthread_rwlock_timedwrlock (r, &ts_timeout), ETIMEDOUT); diff --git a/nptl/tst-sem17.c b/nptl/tst-sem17.c index 80658b85c7..090e390507 100644 --- a/nptl/tst-sem17.c +++ b/nptl/tst-sem17.c @@ -35,7 +35,7 @@ do_test (void) sem_t s; TEST_COMPARE (sem_init (&s, 0, 1), 0); - const struct timespec ts = make_timespec (0, 0); + const struct timespec ts = __make_timespec (0, 0); /* These clocks are meaningless to sem_clockwait. */ #if defined(CLOCK_PROCESS_CPUTIME_ID) diff --git a/nptl/tst-sem5.c b/nptl/tst-sem5.c index 766274e50d..8f5c5b9bb1 100644 --- a/nptl/tst-sem5.c +++ b/nptl/tst-sem5.c @@ -42,7 +42,7 @@ do_test_clock (clockid_t clockid) /* We wait for half a second. */ xclock_gettime (clockid_for_get, &ts); - ts = timespec_add (ts, make_timespec (0, TIMESPEC_HZ/2)); + ts = timespec_add (ts, __make_timespec (0, TIMESPEC_HZ/2)); errno = 0; TEST_COMPARE (TEMP_FAILURE_RETRY ((clockid == CLOCK_USE_TIMEDWAIT) diff --git a/support/timespec-add.c b/support/timespec-add.c index 57bf6682e1..bb22b12e9b 100644 --- a/support/timespec-add.c +++ b/support/timespec-add.c @@ -61,5 +61,5 @@ timespec_add (struct timespec a, struct timespec b) } } - return make_timespec (rs, rns); + return __make_timespec (rs, rns); } diff --git a/support/timespec-sub.c b/support/timespec-sub.c index a1d1a8df92..535a3b155b 100644 --- a/support/timespec-sub.c +++ b/support/timespec-sub.c @@ -61,5 +61,5 @@ timespec_sub (struct timespec a, struct timespec b) } } - return make_timespec (rs, rns); + return __make_timespec (rs, rns); } diff --git a/support/timespec.h b/support/timespec.h index c5852dfe75..dbe12938d8 100644 --- a/support/timespec.h +++ b/support/timespec.h @@ -30,7 +30,7 @@ struct timespec timespec_sub (struct timespec, struct timespec) __attribute__((const)); static inline struct timespec -make_timespec (time_t s, long int ns) +__make_timespec (time_t s, long int ns) { struct timespec r; r.tv_sec = s; diff --git a/sysdeps/pthread/tst-cond26.c b/sysdeps/pthread/tst-cond26.c index e647da00c2..5caf7aaaa7 100644 --- a/sysdeps/pthread/tst-cond26.c +++ b/sysdeps/pthread/tst-cond26.c @@ -36,7 +36,7 @@ do_test (void) { xpthread_mutex_lock (&mut); - const struct timespec ts = make_timespec (0, 0); + const struct timespec ts = __make_timespec (0, 0); /* These clocks are meaningless to sem_clockwait. */ #if defined(CLOCK_PROCESS_CPUTIME_ID) diff --git a/sysdeps/pthread/tst-cond27.c b/sysdeps/pthread/tst-cond27.c index c8142abf9e..3d7b8240b1 100644 --- a/sysdeps/pthread/tst-cond27.c +++ b/sysdeps/pthread/tst-cond27.c @@ -42,7 +42,7 @@ do_test_clock (clockid_t clockid) /* Waiting for the condition will fail. But we want the timeout here. */ const struct timespec ts_now = xclock_now (clockid); const struct timespec ts_timeout = - timespec_add (ts_now, make_timespec (0, 500000000)); + timespec_add (ts_now, __make_timespec (0, 500000000)); /* In theory pthread_cond_clockwait could return zero here due to spurious wakeup. However that can't happen without a signal or an diff --git a/sysdeps/pthread/tst-join14.c b/sysdeps/pthread/tst-join14.c index 0109324453..092f454449 100644 --- a/sysdeps/pthread/tst-join14.c +++ b/sysdeps/pthread/tst-join14.c @@ -34,7 +34,7 @@ static void * tf (void *arg) { - struct timespec ts = make_timespec(0, 100000); + struct timespec ts = __make_timespec(0, 100000); nanosleep(&ts, NULL); return (void *) 42l; diff --git a/sysdeps/pthread/tst-join3.c b/sysdeps/pthread/tst-join3.c index ffebcf586f..fc54f12cc9 100644 --- a/sysdeps/pthread/tst-join3.c +++ b/sysdeps/pthread/tst-join3.c @@ -54,7 +54,7 @@ do_test_clock (clockid_t clockid) void *status; struct timespec timeout = timespec_add (xclock_now (clockid_for_get), - make_timespec (0, 200000000)); + __make_timespec (0, 200000000)); int val; if (clockid == CLOCK_USE_TIMEDJOIN) @@ -69,7 +69,7 @@ do_test_clock (clockid_t clockid) while (1) { timeout = timespec_add (xclock_now (clockid_for_get), - make_timespec (0, 200000000)); + __make_timespec (0, 200000000)); if (clockid == CLOCK_USE_TIMEDJOIN) val = pthread_timedjoin_np (th, &status, &timeout); diff --git a/sysdeps/pthread/tst-join5.c b/sysdeps/pthread/tst-join5.c index acdc365c05..525f349a4b 100644 --- a/sysdeps/pthread/tst-join5.c +++ b/sysdeps/pthread/tst-join5.c @@ -46,15 +46,15 @@ thread_join (pthread_t thread, void **retval) { #if defined USE_PTHREAD_TIMEDJOIN_NP const struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME), - make_timespec (1000, 0)); + __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), - make_timespec (1000, 0)); + __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), - make_timespec (1000, 0)); + __make_timespec (1000, 0)); return pthread_clockjoin_np (thread, retval, CLOCK_MONOTONIC, &ts); #else return pthread_join (thread, retval); diff --git a/sysdeps/pthread/tst-mutex5.c b/sysdeps/pthread/tst-mutex5.c index 14490768c3..72fdbdaea5 100644 --- a/sysdeps/pthread/tst-mutex5.c +++ b/sysdeps/pthread/tst-mutex5.c @@ -68,7 +68,7 @@ do_test_clock (clockid_t clockid, const char *fnname) /* Wait 2 seconds. */ struct timespec ts_timeout = timespec_add (xclock_now (clockid_for_get), - make_timespec (2, 0)); + __make_timespec (2, 0)); if (clockid == CLOCK_USE_TIMEDLOCK) TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), ETIMEDOUT); @@ -89,7 +89,7 @@ do_test_clock (clockid_t clockid, const char *fnname) const struct timespec ts_start = xclock_now (CLOCK_REALTIME); /* Wait 2 seconds. */ - ts_timeout = timespec_add (ts_start, make_timespec (2, 0)); + ts_timeout = timespec_add (ts_start, __make_timespec (2, 0)); if (clockid == CLOCK_USE_TIMEDLOCK) TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), 0); @@ -100,7 +100,7 @@ do_test_clock (clockid_t clockid, const char *fnname) /* Check that timedlock didn't delay. We use a limit of 0.1 secs. */ TEST_TIMESPEC_BEFORE (ts_end, - timespec_add (ts_start, make_timespec (0, 100000000))); + timespec_add (ts_start, __make_timespec (0, 100000000))); TEST_COMPARE (pthread_mutex_unlock (&m), 0); TEST_COMPARE (pthread_mutex_destroy (&m), 0); diff --git a/sysdeps/pthread/tst-mutex9.c b/sysdeps/pthread/tst-mutex9.c index 2d7927b7c2..d03a22b97a 100644 --- a/sysdeps/pthread/tst-mutex9.c +++ b/sysdeps/pthread/tst-mutex9.c @@ -102,7 +102,7 @@ do_test_clock (clockid_t clockid) FAIL_EXIT1 ("child: mutex_unlock succeeded"); const struct timespec ts = timespec_add (xclock_now (clockid_for_get), - make_timespec (0, 500000000)); + __make_timespec (0, 500000000)); if (clockid == CLOCK_USE_TIMEDLOCK) TEST_COMPARE (pthread_mutex_timedlock (m, &ts), ETIMEDOUT);