From patchwork Mon Jan 29 08:00:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Vagin X-Patchwork-Id: 10189381 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0E3F960388 for ; Mon, 29 Jan 2018 08:00:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00D8A285DC for ; Mon, 29 Jan 2018 08:00:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E993428615; Mon, 29 Jan 2018 08:00:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 899B0285DC for ; Mon, 29 Jan 2018 08:00:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751410AbeA2IA5 (ORCPT ); Mon, 29 Jan 2018 03:00:57 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:42212 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751394AbeA2IAy (ORCPT ); Mon, 29 Jan 2018 03:00:54 -0500 Received: by mail-pg0-f66.google.com with SMTP id j16so2427310pgn.9 for ; Mon, 29 Jan 2018 00:00:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=yeuzaqK3J5VQPnJbA7z3J76bbUQ6hm/3I+LtP3aM84I=; b=KFCnSug4qKxuPY5h3DB3LRgK+3kaju5iMSkfI7WhdCCLDFyac/hcgw+p4mrOkGleIs QLaTsRmsH2HKY8UqBzyEvDMRqkw89hkIc8uAubLpLiPp6tgiIJMAUHl1Vc/df75u3tRs RNzICBOQthehVlWI6hMf1vopGPfsB2e0XcmLkeddlaZcBUzkrMNiwBHENDlGu7kRbtgj GySzVn/MnBlIW2E4RZeyR72l5jrsTYjaduhMTzrDiCxmzy/TLEs/7ag5tDJgEx9wsbmR bE0yyYuFrBn8BrJNtTyBT8vUn1fPn+T6YVH2hqyMVrxxnGregdJQF+SrgfI+3ooHteBa iOYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=yeuzaqK3J5VQPnJbA7z3J76bbUQ6hm/3I+LtP3aM84I=; b=Xm7BLjLEvrhiUTJ25iiqkgwQVcqUImU1qlIQuB979nOECkowS+H7F55xjOjWAQjHlN NLq4gK1g1t4XapKwRD2EQXNcomIh1NyTQdg9854DhED6LB9Kq1XuNnrS9uHxU3zqssFl 2YgjyHniHy1foioUziuO2DTJK5UbBEXqzZQB1/kpFon8h42iEAzytFpjVsNGWhagKPct w1FF1MrXoQxV7k5yB+YbQulveJVxZTqFF/F16LhjWdrCkPIx2fy9KZHmwYt+pNiW3pR6 AGj5mgtI5uR99wVW58wF8aligY7U0BlxcEsG+Ii7FmQobuanmCYK8TAR3G32HJwWjy3X JOmw== X-Gm-Message-State: AKwxyte678zpLG7kNC4wgantunOF4hhe0SPNMaSu1Uf9SimBzkiS3PaR 7SdmL256PJuUJ5pRyIxNXXoAJHnQ X-Google-Smtp-Source: AH8x2257xf1X/hnfJpkVx6j1uYXtrjzM1IOYs7qLeVN/lDKyMrxAMXrafmIK34BOyd09+VXn0EvsvA== X-Received: by 2002:a17:902:c81:: with SMTP id 1-v6mr21224235plt.281.1517212853950; Mon, 29 Jan 2018 00:00:53 -0800 (PST) Received: from localhost.localdomain (c-73-140-212-29.hsd1.wa.comcast.net. [73.140.212.29]) by smtp.gmail.com with ESMTPSA id 191sm30112462pfv.127.2018.01.29.00.00.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Jan 2018 00:00:53 -0800 (PST) From: Andrei Vagin To: linux-fsdevel@vger.kernel.org, Andrew Morton Cc: Alexey Dobriyan , Andrei Vagin Subject: [PATCH 3/4] proc: optimize single-symbol delimiters to spead up seq_put_decimal_ull Date: Mon, 29 Jan 2018 00:00:42 -0800 Message-Id: <20180129080043.14191-3-avagin@openvz.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180129080043.14191-1-avagin@openvz.org> References: <20180129080043.14191-1-avagin@openvz.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A delimiter is a string which is printed before a number. A syngle-symbol delimiters can be printed by set_putc() and this works faster than printing by set_puts(). == test_proc.c int main(int argc, char **argv) { int n, i, fd; char buf[16384]; n = atoi(argv[1]); for (i = 0; i < n; i++) { fd = open(argv[2], O_RDONLY); if (fd < 0) return 1; if (read(fd, buf, sizeof(buf)) <= 0) return 1; close(fd); } return 0; } == $ time ./test_proc 1000000 /proc/1/stat == Before patch == real 0m3.820s user 0m0.337s sys 0m3.394s == After patch == real 0m3.110s user 0m0.324s sys 0m2.700s Signed-off-by: Andrei Vagin --- fs/seq_file.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/seq_file.c b/fs/seq_file.c index 55c89eb95a90..d14b023bc0f8 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -685,12 +685,12 @@ void seq_put_decimal_ull_aligned(struct seq_file *m, const char *delimiter, if (m->count + 2 >= m->size) /* we'll write 2 bytes at least */ goto overflow; - len = strlen(delimiter); - if (m->count + len >= m->size) - goto overflow; - - memcpy(m->buf + m->count, delimiter, len); - m->count += len; + if (delimiter && delimiter[0]) { + if (delimiter[1] == 0) + seq_putc(m, delimiter[0]); + else + seq_puts(m, delimiter); + } if (!width) width = 1; @@ -778,12 +778,12 @@ void seq_put_decimal_ll(struct seq_file *m, const char *delimiter, long long num if (m->count + 3 >= m->size) /* we'll write 2 bytes at least */ goto overflow; - len = strlen(delimiter); - if (m->count + len >= m->size) - goto overflow; - - memcpy(m->buf + m->count, delimiter, len); - m->count += len; + if (delimiter && delimiter[0]) { + if (delimiter[1] == 0) + seq_putc(m, delimiter[0]); + else + seq_puts(m, delimiter); + } if (m->count + 2 >= m->size) goto overflow;