From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AC03C433F5 for ; Sun, 24 Apr 2022 02:57:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237836AbiDXDAC (ORCPT ); Sat, 23 Apr 2022 23:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229885AbiDXDAB (ORCPT ); Sat, 23 Apr 2022 23:00:01 -0400 Received: from mail.meizu.com (edge07.meizu.com [112.91.151.210]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B828B13F26B; Sat, 23 Apr 2022 19:57:00 -0700 (PDT) Received: from IT-EXMB-1-125.meizu.com (172.16.1.125) by mz-mail11.meizu.com (172.16.1.15) with Microsoft SMTP Server (TLS) id 14.3.487.0; Sun, 24 Apr 2022 10:56:55 +0800 Received: from [172.16.137.70] (172.16.137.70) by IT-EXMB-1-125.meizu.com (172.16.1.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Sun, 24 Apr 2022 10:56:53 +0800 Message-ID: <049ccac8-c394-0cdc-c2ed-4ea91cab6439@meizu.com> Date: Sun, 24 Apr 2022 10:56:52 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst To: Alex Shi , CC: , , , , References: <1650424016-7225-1-git-send-email-baihaowen@meizu.com> <1650424016-7225-2-git-send-email-baihaowen@meizu.com> <30d2f96e-99e1-2976-a294-8e112166afff@gmail.com> From: baihaowen In-Reply-To: <30d2f96e-99e1-2976-a294-8e112166afff@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [172.16.137.70] X-ClientProxiedBy: IT-EXMB-1-126.meizu.com (172.16.1.126) To IT-EXMB-1-125.meizu.com (172.16.1.125) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 4/23/22 6:27 PM, Alex Shi 写道: > Hi Haowen, > > I hit the mistake again while apply your patch: > $git am your_patch > error: cannot convert from N to UTF-8 > > fatal: could not parse patch > > > You have to try apply it before sending out your patch. > and this patch is better be to be 2nd patch in series. > > Thanks > Alex > > On 4/20/22 11:06, Haowen Bai wrote: >> As the tools/vm/page_owner_sort added some feature and original text >> updated, sync the translation of zh_CN as below. >> >> Commit 8bd16bc0a081 ("tools/vm/page_owner_sort.c: support sorting blocks >> by multiple keys") add sorting blocks by multiple keys usage >> description. >> >> Commit 78a0b94f3829 ("tools/vm/page_owner_sort.c: support for multi-value >> selection in single argument") add multi-value selection in single >> argument usage description. >> >> Commit c89b3ad2dea2 ("doc/vm/page_owner.rst: remove content related to -c >> option") remove -c option usage description. >> >> Commit 9c8a0a8e599f ("tools/vm/page_owner_sort.c: support for user-defined >> culling rules") add user-defined culling rules usage description. >> >> Commit 8ea8613a616a ("tools/vm/page_owner_sort.c: support for selecting by >> PID, TGID or task command name") add selecting by PID, TGID or task >> command name usage description. >> >> Commit 194d52d771b8 ("tools/vm/page_owner_sort: support for sorting by >> task command name") add sorting by task command name usage description. >> >> Signed-off-by: Haowen Bai >> --- >> Documentation/translations/zh_CN/vm/page_owner.rst | 61 +++++++++++++++++++++- >> 1 file changed, 60 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/translations/zh_CN/vm/page_owner.rst b/Documentation/translations/zh_CN/vm/page_owner.rst >> index 9e951fabba9d..c692e81c724e 100644 >> --- a/Documentation/translations/zh_CN/vm/page_owner.rst >> +++ b/Documentation/translations/zh_CN/vm/page_owner.rst >> @@ -103,14 +103,73 @@ page owner在默认情况下是禁用的。所以，如果你想使用它，你 >> -m 按总内存排序 >> -p 按pid排序。 >> -P 按tgid排序。 >> + -n 按任务名称排序。 >> -r 按内存释放时间排序。 >> -s 按堆栈跟踪排序。 >> -t 按时间排序（默认）。 >> + --sort 指定排序顺序。排序语法是 [+|-]key[,[+|-]key[,...]]. 从 >> + **标准格式说明符** 部分选择一个键。"+" 是可选的，因为默认方向是增加数字或字典顺序。 >> + 允许混合使用缩写键和全称键。 >> + >> + Examples: >> + ./page_owner_sort --sort=n,+pid,-tgid >> + ./page_owner_sort --sort=at >> >> 其它函数: >> >> Cull: >> - -c 通过比较堆栈跟踪而不是总块来进行剔除。 >> + --cull >> + 指定筛选规则。筛选语法是 key[,key[,...]]。在**标准格式说明符**部分选择一个多字母键 >> + >> + 是逗号分隔列表形式的单个参数，它提供了一种指定单个筛选规则的方法。下面的**标准格式说明 >> + 符**部分描述了可识别的关键字。 可以由键 k1,k2, ... 顺序指定，如下面的 >> + STANDARD SORT KEYS 部分所述。允许混合使用缩写形式和完整形式的键。 >> >> + Examples: >> + ./page_owner_sort --cull=stacktrace >> + ./page_owner_sort --cull=st,pid,name >> + ./page_owner_sort --cull=n,f >> Filter: >> -f 过滤掉内存已被释放的块的信息。 >> + >> + Select: >> + --pid 通过 pid 进行选择。这将选择进程 ID 号出现在 中的块。 >> + --tgid 通过 tgid 进行选择。这将选择线程组 ID 号出现在 中的块。 >> + --name 按任务名称选择。这将选择任务名称出现在 中的块。 >> + >> + 、、是逗号分隔列表形式的单参数，它提供了一种指定单个选择规则的方法。 >> + >> + >> + Examples: >> + ./page_owner_sort --pid=1 >> + ./page_owner_sort --tgid=1,2,3 >> + ./page_owner_sort --name name1,name2 >> + >> +标准格式说明符 >> +============== >> + >> +--sort 选项: >> + >> + ====== ========== =================== >> + 缩写键 全称键 描述 >> + ====== ========== =================== >> + p pid 进程 ID >> + tg tgid 线程组 ID >> + n name 任务名称 >> + st stacktrace 页面分配的调用栈 >> + T txt 块的全文 >> + ft free_ts 页面被释放的时间戳 >> + at alloc_ts 页面分配的时间戳 >> + ====== ========== =================== >> + >> +--curl 选项: >> + >> + ====== ========== ================== >> + 缩写键 全称键 描述 >> + ====== ========== ================== >> + p pid 进程 ID >> + tg tgid 线程组 ID >> + n name 任务名称 >> + f free 该页面是否已被释放 >> + st stacktrace 页面分配的调用栈 >> + ====== ========== ================== hi, Alex I can apply local. ➜  linux-next git:(heads/next-20220421) ✗ git am doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch 应用：docs/zh_CN: sync with original text Documentation/vm/page_owner.rst ➜  linux-next git:(heads/next-20220421) ✗ git am doc_pageonwer_patches/0002-doc-vm-page_owner.rst-Fix-table-display-confusion.patch    应用：doc/vm/page_owner.rst: Fix table display confusion I think git send-email will change format by my select. I'll try to resend. -- Haowen Bai