From patchwork Wed Oct 26 19:04:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 59498 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 4EDC9382A2C0 for ; Wed, 26 Oct 2022 19:04:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4EDC9382A2C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666811096; bh=KTw2+ljEHDl2egvwLncm5NRBmbSv6sOxIcwEDeVGbpM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=dSnPpeDIQEskgo3SbHs7tTb6NqCw0l9dHoqAhBo9Xhjrp16olrfko0cWWixayxQDA f9w5ROUoinEKAL7E3bcpkp9LKPkX/6DvrvLCfxoPoJq36tCwZUYruRcwN+XpWUmeU0 Uut/NpL9s1hSfJK1Vd9DGyHDdRprDZAf86h8qHAE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by sourceware.org (Postfix) with ESMTPS id 67BC23884576 for ; Wed, 26 Oct 2022 19:04:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 67BC23884576 Received: by mail-oi1-x22a.google.com with SMTP id g10so19862537oif.10 for ; Wed, 26 Oct 2022 12:04:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KTw2+ljEHDl2egvwLncm5NRBmbSv6sOxIcwEDeVGbpM=; b=NxC6lqxBDC4kFAK4nC5ebLoQqynNJVLoatSaPOpqCNX+vB7vsEkkjPwRlvlcP4xmj7 ohiG1D2Tu/UUMx5g5MRZYyomBrhHwlq3AMwO48pjWtNz1b58frn7S1tehg7/fEXRTCSy hj7i0IVH8D+ERBE01BtRftBWJooZ4lnX5v/whjYG9l2pV8bLprjlLU0WhwefxNJiZwI9 EkSV+e1WLnKu3QGC+hK6ZDgjV3HD0lvwV5Y0vejDZuZNbfVwx13Uji2dr4H+fGz5n2IZ bgnKT6eRrh1fnerxymhyLY+5EhY6h+AlMPQG3c8JY9OsqEibH3RAmlkllj0waOgym1eV Rx9A== X-Gm-Message-State: ACrzQf2JJQy3bjAGhHbdQKCLxDK2njaBJ3UaBvVxm0Hcka+9IPD3+pkQ 5sIfqAfS7uKv1107Cl3d8vZ2i51X4Q1yILVh X-Google-Smtp-Source: AMsMyM6HNVCM5wk13hty2ye3XZ1x5UKvEVI+jBZ2B7gazpGYgynC3xPwYp//qBsmUviTDHnaTOZT5w== X-Received: by 2002:a05:6808:1893:b0:354:b5bc:cd0d with SMTP id bi19-20020a056808189300b00354b5bccd0dmr2770773oib.244.1666811071535; Wed, 26 Oct 2022 12:04:31 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:17c8:6a6b:43f7:824e:663]) by smtp.gmail.com with ESMTPSA id c17-20020aca1c11000000b00359af7ea8fdsm714937oic.34.2022.10.26.12.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 12:04:31 -0700 (PDT) To: libc-alpha@sourceware.org, Zev Weiss , Wayne Tung Subject: [PATCH 1/3] nis: Build libnsl with 64 bit time_t Date: Wed, 26 Oct 2022 16:04:23 -0300 Message-Id: <20221026190425.2939456-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221026190425.2939456-1-adhemerval.zanella@linaro.org> References: <20221026190425.2939456-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And remove the usage of glibc reserved names. Reviewed-by: DJ Delorie --- Makeconfig | 2 +- nis/nis_call.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makeconfig b/Makeconfig index 08a869cd11..f3f816ce32 100644 --- a/Makeconfig +++ b/Makeconfig @@ -884,7 +884,7 @@ endif # Use 64 bit time_t support for installed programs installed-modules = nonlib nscd ldconfig locale_programs \ iconvprogs libnss_files libnss_compat libnss_db libnss_hesiod \ - libutil libpcprofile + libutil libpcprofile libnsl +extra-time-flags = $(if $(filter $(installed-modules),\ $(in-module)),-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64) diff --git a/nis/nis_call.c b/nis/nis_call.c index 90187e30b1..5b9dd50151 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -574,7 +574,7 @@ static struct nis_server_cache unsigned int size; unsigned int server_used; unsigned int current_ep; - __time64_t expires; + time_t expires; char name[]; } *nis_server_cache[16]; static time_t nis_cold_start_mtime; @@ -583,7 +583,7 @@ __libc_lock_define_initialized (static, nis_server_cache_lock) static directory_obj * nis_server_cache_search (const_nis_name name, int search_parent, unsigned int *server_used, unsigned int *current_ep, - struct __timespec64 *now) + struct timespec *now) { directory_obj *ret = NULL; int i; @@ -641,7 +641,7 @@ nis_server_cache_search (const_nis_name name, int search_parent, static void nis_server_cache_add (const_nis_name name, int search_parent, directory_obj *dir, unsigned int server_used, - unsigned int current_ep, struct __timespec64 *now) + unsigned int current_ep, struct timespec *now) { struct nis_server_cache **loc; struct nis_server_cache *new; @@ -707,7 +707,7 @@ __nisfind_server (const_nis_name name, int search_parent, nis_error result = NIS_SUCCESS; nis_error status; directory_obj *obj; - struct __timespec64 ts; + struct timespec ts; unsigned int server_used = ~0; unsigned int current_ep = ~0; @@ -717,7 +717,7 @@ __nisfind_server (const_nis_name name, int search_parent, if (*dir != NULL) return NIS_SUCCESS; - __clock_gettime64 (CLOCK_REALTIME, &ts); + clock_gettime (CLOCK_REALTIME, &ts); if ((flags & NO_CACHE) == 0) *dir = nis_server_cache_search (name, search_parent, &server_used, From patchwork Wed Oct 26 19:04:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 59499 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 1D3D63888801 for ; Wed, 26 Oct 2022 19:05:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D3D63888801 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666811100; bh=fuwDpx+c3iZ2JTMWpUyqJkfVVNT7ulWGKuMxvxVi3X4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=M06K8ajrAsKWqWIEM+GcpvhBgfARcG74sr3eSNiKXoBcKmpzalBC9wFoYCqbGF6Uk LdnLWpXBE6FJ9EoAAdGIbt0meF7tnh6ZWRq/YMRNS9yGvULKmBGZWpcZ/6hK3IPguQ Hsw/KcoV5a5cXVukGAAVEoShFyJ/DHd9ftonMYoM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc29.google.com (mail-oo1-xc29.google.com [IPv6:2607:f8b0:4864:20::c29]) by sourceware.org (Postfix) with ESMTPS id 90F353885524 for ; Wed, 26 Oct 2022 19:04:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 90F353885524 Received: by mail-oo1-xc29.google.com with SMTP id c13-20020a4ac30d000000b0047663e3e16bso2519784ooq.6 for ; Wed, 26 Oct 2022 12:04:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fuwDpx+c3iZ2JTMWpUyqJkfVVNT7ulWGKuMxvxVi3X4=; b=MN0yzUfn1zi4MiZG4bTlxQpS+HIk9lougLIu+jA2tiXweOB6X37c+Wj8j++EW9AuWO 623whEiKz0uvOIn0gpbkhPW2T5Qh2vntSl2+1YI1E1npoFGBsBMOhdbaRs6wl9e8L2bU 898T5gg33vXjndb3BRS1D76ls2MbqBqC7Em7mcIp1b89aaY9aDJBI16S3IbGkErDrHJs N/WT5cbn47YMuxW3zskXOMAj6USKY4U2iLOroEMwFb8CcfLOW4nmp/BCM3Ra632iuvOI c+IJUrONNq3UrnmpPjUVr/nKW5ZdbI8K7E+k3GvmUQDGRfYwEe747AXM9PpSSN/g6mBC y6hA== X-Gm-Message-State: ACrzQf0otCojZuyBY4q2pfpEv3e5R6n5S5G6eXJ7E5dUAsIlf38ML/JD XKFyisZulvzKki8zV1PzrGf42OK5wQ3ftEI/ X-Google-Smtp-Source: AMsMyM4e6jFWdFFHSNMIg/7LHlRfFyIH/WTAYe+mcl8L8U+h04prxBuj/3/5bsbCpBeCSgSCS+/FCQ== X-Received: by 2002:a4a:c684:0:b0:485:520f:c352 with SMTP id m4-20020a4ac684000000b00485520fc352mr8470391ooq.81.1666811073673; Wed, 26 Oct 2022 12:04:33 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:17c8:6a6b:43f7:824e:663]) by smtp.gmail.com with ESMTPSA id c17-20020aca1c11000000b00359af7ea8fdsm714937oic.34.2022.10.26.12.04.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 12:04:32 -0700 (PDT) To: libc-alpha@sourceware.org, Zev Weiss , Wayne Tung Subject: [PATCH 2/3] nscd: Use 64 bit time_t on libc nscd routines (BZ# 29402) Date: Wed, 26 Oct 2022 16:04:24 -0300 Message-Id: <20221026190425.2939456-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221026190425.2939456-1-adhemerval.zanella@linaro.org> References: <20221026190425.2939456-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Although the nscd module is built with 64 bit time_t, the routines linked direct to libc.so need to use the internal symbols. Reviewed-by: DJ Delorie --- nscd/nscd.h | 2 +- nscd/nscd_gethst_r.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nscd/nscd.h b/nscd/nscd.h index 368091aef8..f15321585b 100644 --- a/nscd/nscd.h +++ b/nscd/nscd.h @@ -65,7 +65,7 @@ typedef enum struct traced_file { /* Tracks the last modified time of the traced file. */ - time_t mtime; + __time64_t mtime; /* Support multiple registered files per database. */ struct traced_file *next; int call_res_init; diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index 31d13580a1..5958f181db 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -112,7 +112,7 @@ __nscd_get_nl_timestamp (void) if (map == NULL || (map != NO_MAPPING && map->head->nscd_certainly_running == 0 - && map->head->timestamp + MAPPING_TIMEOUT < time_now ())) + && map->head->timestamp + MAPPING_TIMEOUT < time64_now ())) map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped); if (map == NO_MAPPING) From patchwork Wed Oct 26 19:04:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 59500 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 20141388553A for ; Wed, 26 Oct 2022 19:05:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20141388553A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666811104; bh=4OIAik8C/5oy3dCjxyUcSZewuhDpWRcxlTiShPja/p0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=bILqQR8ykEjXGesXWrBlnq3ZihAXdX5dy08oxJiTPLwjw0xUH0ZJyYwOOT29+68Yu sQZJymYIR9QY4osTnBDFM0ZQrE+6cDKgIsZyXCE9AlfqyXxgHd5B1gCoJPBsWqWPVM 1JbDu6XTaNsffPx6PegSPAsuEV7p/wRdvFxZ8G6s= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc2c.google.com (mail-oo1-xc2c.google.com [IPv6:2607:f8b0:4864:20::c2c]) by sourceware.org (Postfix) with ESMTPS id 5A3E6388553A for ; Wed, 26 Oct 2022 19:04:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5A3E6388553A Received: by mail-oo1-xc2c.google.com with SMTP id s125-20020a4a5183000000b0047fbaf2fcbcso2510225ooa.11 for ; Wed, 26 Oct 2022 12:04:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4OIAik8C/5oy3dCjxyUcSZewuhDpWRcxlTiShPja/p0=; b=Jys1G+2G/we+t29aZrf9frxAeviJWyUjDQ6M27+g+kZDbUxkBiroXguH/WjLfUx+cD i6VDWfqm114AhW3ujKwIALyT6DPDOnbdOBm4lZhTidsi745TFadyKlg29JiUMgL6u5vE QRzV0LxMxSxsQMUBBSuleQPav8L18igp0aN3YzlXzrrNyIy+zCa1SkI6d43rHwmbC2cL XFfSKjQhxtacI6caqJdV08FmPotzcs53xUkWkE2o0VEVb8L6yMtM0mRp/sNCXA9zrpVj Z0J0iPWlUuxB4JzvgZSU+aZ4+LNX0Y6ms6b7C+E9QkqJtSAuF+sKKCVZRWTdNmMBb8wZ sAVg== X-Gm-Message-State: ACrzQf1tbdtypdqQTip5Qkpnn5X3vMDEiFFzCfEAa5ryJX+5KbLq3wme GrfprvtfDA2GnWPsT0g//KgEbmUiGG4LW19k X-Google-Smtp-Source: AMsMyM4yMjnJtFaQl1C1Cfdza4N3XGJkqcyA10av5+Q2a3E9WvNCf+QIy9Ztmprgm7RPYMbrnrIq9Q== X-Received: by 2002:a4a:e411:0:b0:442:c893:86b7 with SMTP id t17-20020a4ae411000000b00442c89386b7mr19458127oov.22.1666811075511; Wed, 26 Oct 2022 12:04:35 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:17c8:6a6b:43f7:824e:663]) by smtp.gmail.com with ESMTPSA id c17-20020aca1c11000000b00359af7ea8fdsm714937oic.34.2022.10.26.12.04.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 12:04:35 -0700 (PDT) To: libc-alpha@sourceware.org, Zev Weiss , Wayne Tung Subject: [PATCH 3/3] time: Use 64 bit time on tzfile Date: Wed, 26 Oct 2022 16:04:25 -0300 Message-Id: <20221026190425.2939456-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221026190425.2939456-1-adhemerval.zanella@linaro.org> References: <20221026190425.2939456-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The tzfile_mtime is already compared to 64 bit time_t stat call. Reviewed-by: DJ Delorie --- time/tzfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time/tzfile.c b/time/tzfile.c index dd75848ba9..394b098856 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -32,7 +32,7 @@ int __use_tzfile; static dev_t tzfile_dev; static ino64_t tzfile_ino; -static time_t tzfile_mtime; +static __time64_t tzfile_mtime; struct ttinfo {