From patchwork Fri Nov 28 11:05:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 415840 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 797011401D0 for ; Fri, 28 Nov 2014 22:07:32 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XuJNB-0008NG-RU; Fri, 28 Nov 2014 11:06:01 +0000 Received: from mail-wg0-f46.google.com ([74.125.82.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XuJN8-00089z-P5 for linux-mtd@lists.infradead.org; Fri, 28 Nov 2014 11:05:59 +0000 Received: by mail-wg0-f46.google.com with SMTP id a1so305562wgh.5 for ; Fri, 28 Nov 2014 03:05:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc :content-type; bh=+cCdYR9KP6evz5UbSQvxRU6d3m2eyWSj9P9t+a5FSqc=; b=Nv/naMVyOwCjBM4mMEmdrRqfZ7ZPWWAByBCTbbSoRW6FQOzRLOcxHfonMFvs7EiJXZ svuAH8r7SekD6rqPb6AL2klxorJ0pUutraKqAuZW4VsWHoCLCBn4SO74fpsaJsAnGCzr HsYs5M0dfbWdwUAPWdciQQYw7Ox3M6kiRyHIqCNbs8kLhLVo5KN0hxBbM+vNNGerXCEz JX2g4iGkNdl4JI8mXRaSPI47TwsGBBBKqJpJZutI9m4qjdjnDjXQcg5VrWVBh7aXDFc5 gx7ZOYMRhRmdH89zCNKG3oMqW60voW/ArORCrRUAaOnHPOFgYaYNuwiHcDCapzZkF1CM aflw== X-Gm-Message-State: ALoCoQlkWrdsLYPJvis68gcDFXZx0buBrOrhKJXlgAq4hhu1nW4PSahElAAvlujsNEFmxRJ4q281 MIME-Version: 1.0 X-Received: by 10.194.85.83 with SMTP id f19mr69543448wjz.20.1417172733934; Fri, 28 Nov 2014 03:05:33 -0800 (PST) Received: by 10.194.44.67 with HTTP; Fri, 28 Nov 2014 03:05:33 -0800 (PST) Date: Fri, 28 Nov 2014 19:05:33 +0800 Message-ID: Subject: [PATCH] mtd: test: Replace timeval with ktime_t in speedtest.c and torturetest.c From: Chunyan Zhang To: dwmw2@infradead.org, computersforpeace@gmail.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141128_030558_999048_9E1F7227 X-CRM114-Status: GOOD ( 12.06 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.46 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.46 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: john.stultz@linaro.org, linux-mtd@lists.infradead.org, Arnd Bergmann X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch changes the 32-bit time type (timeval) to 64-bit (ktime_t), since 32-bit time types will break in the year 2038. I use ktime_t instead of timeval to define 'start' and 'finish' which are used to get the time for tow points. This patch also changes do_gettimeofday() to ktime_get() accordingly, since ktime_get returns a ktime_t, but do_gettimeofday returns a struct timeval, and the other reason is that ktime_get() uses the monotonic clock. Signed-off-by: Chunyan Zhang --- drivers/mtd/tests/speedtest.c | 10 +++++----- drivers/mtd/tests/torturetest.c | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) -- 1.7.9.5 diff --git a/drivers/mtd/tests/speedtest.c b/drivers/mtd/tests/speedtest.c index 5ee9f70..73e26d6 100644 --- a/drivers/mtd/tests/speedtest.c +++ b/drivers/mtd/tests/speedtest.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "mtd_test.h" @@ -49,7 +50,7 @@ static int pgsize; static int ebcnt; static int pgcnt; static int goodebcnt; -static struct timeval start, finish; +static ktime_t start, finish; static int multiblock_erase(int ebnum, int blocks) { @@ -168,12 +169,12 @@ static int read_eraseblock_by_2pages(int ebnum) static inline void start_timing(void) { - do_gettimeofday(&start); + start = ktime_get(); } static inline void stop_timing(void) { - do_gettimeofday(&finish); + finish = ktime_get(); } static long calc_speed(void) @@ -181,8 +182,7 @@ static long calc_speed(void) uint64_t k; long ms; - ms = (finish.tv_sec - start.tv_sec) * 1000 + - (finish.tv_usec - start.tv_usec) / 1000; + ms = ktime_to_ms(ktime_sub(finish, start)); if (ms == 0) return 0; k = goodebcnt * (mtd->erasesize / 1024) * 1000; diff --git a/drivers/mtd/tests/torturetest.c b/drivers/mtd/tests/torturetest.c index eeab969..620fff6 100644 --- a/drivers/mtd/tests/torturetest.c +++ b/drivers/mtd/tests/torturetest.c @@ -79,18 +79,18 @@ static unsigned char *check_buf; static unsigned int erase_cycles; static int pgsize; -static struct timeval start, finish; +static ktime_t start, finish; static void report_corrupt(unsigned char *read, unsigned char *written); static inline void start_timing(void) { - do_gettimeofday(&start); + start = ktime_get(); } static inline void stop_timing(void) { - do_gettimeofday(&finish); + finish = ktime_get(); } /* @@ -322,8 +322,7 @@ static int __init tort_init(void) long ms; stop_timing(); - ms = (finish.tv_sec - start.tv_sec) * 1000 + - (finish.tv_usec - start.tv_usec) / 1000; + ms = ktime_to_ms(ktime_sub(finish, start)); pr_info("%08u erase cycles done, took %lu " "milliseconds (%lu seconds)\n", erase_cycles, ms, ms / 1000);