From patchwork Fri Oct 25 12:08:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 177739 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3603294ill; Fri, 25 Oct 2019 05:10:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZEC6kbZk4T1ORvPmi6C3FDFA7NlQGg9dNK9ZylIfUNfyBTsk4m4Wyv92UB4TGq4j8Tx+d X-Received: by 2002:a50:b901:: with SMTP id m1mr3501298ede.203.1572005421722; Fri, 25 Oct 2019 05:10:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572005421; cv=none; d=google.com; s=arc-20160816; b=JgYnfLp2GqBuw+3oMVbDDFJoCycG7WQXd5Xp1Mks771EtzE9X2GsElJH+myEC1dQ4A j/V7U1s9xpZOeXmT6H6gC9NJYBWSHAYDxcxsdfU0V/1ms4X8G3ewJJV22X8RWJKz+6YR cMiVai/L5KC/EInQYrOghRm/jzTr3pGO+diGjhWaQmRNmeuFysOQY54JEujBdhpcl5Hd iTLD9ixdZGq+ZqZEWn4NLSvm6r8RORJ+0kbf4a5a1JUzHdqG0+fO0Yby6xnOK/Wfi8UW IxLqy1C5ajsQRKYPQIpgBKG5Tg1XpRUikIZ5SYWze84Cn1HZPQxBFlGkVemQMgvAhunW wt7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature; bh=p7xqpNpsSLQ4BUt7Cb7iKE2csS0sPRayFLZWrRFrD00=; b=uJTF0dxrgbILDos9hyjG2JM2qES7aj6/d7yXxXv5fGDhD6R5NLS3XRIF1DWfRjZ2ff YA2+kMXnrge0Xko7YVMT6k88XJGQoIlv/QmMpe9IerWgVHI1xit3/yg39khXqHudaImA wJNTth9SVjLiqqhOlorIqY97XOBRxa81H4G6jiIeNgXIS14WgL8U+euR7/GRO800V4dT uuRiB19mDlZVWsTxQ0rcixhW6mIZn5QV2wvH8jR7mTR09orNLiXB6O2ZIPvbDrptLlv1 oWuxndbKXG3a6jLrW4y431PsyFy9Z0OKd7I4CDNDLNv24uKGzWhkfQLQugWVeS9i+PcN sqiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=LsicUfDE; dkim=pass header.i=@linaro.org header.s=google header.b=AZAnyGlW; spf=pass (google.com: domain of libc-alpha-return-106289-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-106289-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id z16si786666edb.23.2019.10.25.05.10.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Oct 2019 05:10:21 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-106289-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=LsicUfDE; dkim=pass header.i=@linaro.org header.s=google header.b=AZAnyGlW; spf=pass (google.com: domain of libc-alpha-return-106289-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-106289-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; q=dns; s=default; b=PgrzzEdaypZvmsBNq2bsB6CUOCcx9S5fMoB1rto4B1N WIWIe2RhCZmms5RlHXQWg6QN1tr9jbDoXbyeh+6x25L+/XTxg57CyBDRqTtYFT0+ eqr2dGQDPD27hjRPGVt6sY+AaZzBBweZueraoPUFlLkC4VondNp7XUC10Uh++ras = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; s=default; bh=sAIibUAX5c8ohSEvI7goIUsLFNc=; b=LsicUfDEDwQ52922T XcSYVEbtRo7V3OEIiephQMBil+x8RVZVSlIa9hugYipRuWgz4UQnTfcJhYRzwnoK xwhDDhppuzHnK6tctxhcgLacs53AUYZn0Dnjiu7aAKaZ2B31rF3ORsIV/C9kCeWd BBDHfKZd8noB+Q7eaTXqYCkBc0= Received: (qmail 78625 invoked by alias); 25 Oct 2019 12:09:03 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 78086 invoked by uid 89); 25 Oct 2019 12:08:59 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=consolidated, offering X-HELO: mail-qk1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p7xqpNpsSLQ4BUt7Cb7iKE2csS0sPRayFLZWrRFrD00=; b=AZAnyGlW20eX1HTt8ME9X1B206B2OTJcar5qSct+r9IFeLeUSUsTsPMiOCMURCdN9V MadmwssVWoIhKCqqdzuFXuGgT9wnuqZ2AWbOXBIn6+3T8w2Q/aA2z8EAxGcUwAKtSfng Gn2DLnkVgepxekVHQgB556d1To0ATjgqvIBN2Ns9BbxA06/nmbNJp3kByV/Gt29AhE/A ou1x1H3sW0z6Q93Ra9VqP4gEnGtUJCTbI4d2PCPbHsgoVS81fst+hZye36otP4A7m7pp Av8+ARorh4FBNHwux0lQVlN9NW3QIkOAWvq8l2yd2BsQwdaFlHPP5+6IR5v8am5ZtWv7 28OA== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Lukasz Majewski , Zack Weinberg Subject: [PATCH v2 07/11] Consolidate and deprecate ftime Date: Fri, 25 Oct 2019 09:08:28 -0300 Message-Id: <20191025120832.27667-8-adhemerval.zanella@linaro.org> In-Reply-To: <20191025120832.27667-1-adhemerval.zanella@linaro.org> References: <20191025120832.27667-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 From: Zack Weinberg Consolidate and deprecate ftime Changes from previous version: - Do not remove sys/timeb.h, instead mark ftime as deprecated. The idea is still to remove it eventually on a future release. -- ftime is an obsolete variation on gettimeofday, offering only millisecond time resolution; it was probably a system call in ooold versions of BSD Unix. For historic reasons, we had three implementations of it. These are all consolidated into time/ftime.c, and then the function is deprecated. For some reason, the implementation of ftime in terms of gettimeofday was rounding rather than truncating microseconds to milliseconds. In all the other places where we use a higher-resolution time function to implement a lower-resolution one, we truncate. ftime is changed to match, just for tidiness' sake. Like gettimeofday, ftime tries to report the time zone, and using that information is always a bug. This patch dummies out the reported timezone information; the timezone and dstflag fields of the returned "struct timeb" will always be zero. Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, powerpc64-linux-gnu, and powerpc-linux-gnu. Co-authored-by: Adhemerval Zanella --- NEWS | 3 +++ sysdeps/unix/bsd/ftime.c | 40 --------------------------------- sysdeps/unix/sysv/linux/ftime.c | 3 --- time/ftime.c | 26 ++++++++------------- time/sys/timeb.h | 3 ++- time/tst-ftime.c | 7 ++++++ 6 files changed, 21 insertions(+), 61 deletions(-) delete mode 100644 sysdeps/unix/bsd/ftime.c delete mode 100644 sysdeps/unix/sysv/linux/ftime.c -- 2.17.1 Reviewed-by: Lukasz Majewski diff --git a/NEWS b/NEWS index 0b1476e745..6d109f84f0 100644 --- a/NEWS +++ b/NEWS @@ -58,6 +58,9 @@ Deprecated and removed features, and other changes affecting compatibility: settimeofday available to newly linked binaries after there is a replacement for Linux’s time-zone-like offset API. +* The obsolete functions ftime has been deprecated and will be removed from + a future version of glibc. Application should use clock_gettime instead. + Changes to build and runtime requirements: [Add changes to build and runtime requirements here] diff --git a/sysdeps/unix/bsd/ftime.c b/sysdeps/unix/bsd/ftime.c deleted file mode 100644 index e1f20bc609..0000000000 --- a/sysdeps/unix/bsd/ftime.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 1994-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include - -int -ftime (struct timeb *timebuf) -{ - struct timeval tv; - struct timezone tz; - - if (__gettimeofday (&tv, &tz) < 0) - return -1; - - timebuf->time = tv.tv_sec; - timebuf->millitm = (tv.tv_usec + 500) / 1000; - if (timebuf->millitm == 1000) - { - ++timebuf->time; - timebuf->millitm = 0; - } - timebuf->timezone = tz.tz_minuteswest; - timebuf->dstflag = tz.tz_dsttime; - return 0; -} diff --git a/sysdeps/unix/sysv/linux/ftime.c b/sysdeps/unix/sysv/linux/ftime.c deleted file mode 100644 index 5a5949f608..0000000000 --- a/sysdeps/unix/sysv/linux/ftime.c +++ /dev/null @@ -1,3 +0,0 @@ -/* Linux defines the ftime system call but doesn't actually implement - it. Use the BSD implementation. */ -#include diff --git a/time/ftime.c b/time/ftime.c index 8bedc0d91e..b4bd58ecef 100644 --- a/time/ftime.c +++ b/time/ftime.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1994-2019 Free Software Foundation, Inc. +/* Deprecated return date and time. + Copyright (C) 1994-2019 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -15,27 +16,18 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include +#include int ftime (struct timeb *timebuf) { - int save = errno; - struct tm tp; - - __set_errno (0); - if (time (&timebuf->time) == (time_t) -1 && errno != 0) - return -1; - timebuf->millitm = 0; - - if (__localtime_r (&timebuf->time, &tp) == NULL) - return -1; - - timebuf->timezone = tp.tm_gmtoff / 60; - timebuf->dstflag = tp.tm_isdst; + struct timespec ts; + __clock_gettime (CLOCK_REALTIME, &ts); - __set_errno (save); + timebuf->time = ts.tv_sec; + timebuf->millitm = ts.tv_nsec / 1000000; + timebuf->timezone = 0; + timebuf->dstflag = 0; return 0; } diff --git a/time/sys/timeb.h b/time/sys/timeb.h index b958dc3e4a..5c16f79da2 100644 --- a/time/sys/timeb.h +++ b/time/sys/timeb.h @@ -36,7 +36,8 @@ struct timeb /* Fill in TIMEBUF with information about the current time. */ -extern int ftime (struct timeb *__timebuf); +extern int ftime (struct timeb *__timebuf) + __nonnull ((1)) __attribute_deprecated__; __END_DECLS diff --git a/time/tst-ftime.c b/time/tst-ftime.c index 4b7e90cc03..39d94a1b26 100644 --- a/time/tst-ftime.c +++ b/time/tst-ftime.c @@ -18,6 +18,7 @@ #include #include +#include static int do_test (void) @@ -29,12 +30,18 @@ do_test (void) { prev = curr; + /* ftime was deprecated on 2.31. */ + DIAG_PUSH_NEEDS_COMMENT; + DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations"); + if (ftime (&curr)) { printf ("ftime returned an error\n"); return 1; } + DIAG_POP_NEEDS_COMMENT; + if (curr.time < prev.time) { printf ("ftime's time flowed backwards\n");