From: baihaowen <baihaowen@meizu.com>
To: Alex Shi <seakeel@gmail.com>, <siyanteng01@gmail.com>
Cc: <alexs@kernel.org>, <corbet@lwn.net>, <linux-doc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <siyanteng@loongson.cn>
Subject: Re: [PATCH V4] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
Date: Tue, 19 Apr 2022 09:24:46 +0800 [thread overview]
Message-ID: <c16eb087-8a29-fcdc-07b1-5624cdfdb4ec@meizu.com> (raw)
In-Reply-To: <202ba5f5-f842-f4ce-dd67-c5166d94cc67@gmail.com>
在 4/18/22 8:41 PM, Alex Shi 写道:
> Hi Haowen,
>
> There are still some space error during the 'git apply'.
> Could you like to fix them?
>
> thanks
> Alex
>
> Applying: docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
>
> .git/rebase-apply/patch:21: trailing whitespace.
>
> --sort <order> 指定排序顺序。排序语法是 [+|-]key[,[+|-]key[,...]]. 从
>
> .git/rebase-apply/patch:65: indent with spaces.
>
> ====== ========== ===================
>
> .git/rebase-apply/patch:66: indent with spaces.
>
> 缩写键 全称键 描述
>
> .git/rebase-apply/patch:67: indent with spaces.
>
> ====== ========== ===================
>
> .git/rebase-apply/patch:68: indent with spaces.
>
> p pid 进程 ID
>
> warning: squelched 16 whitespace errors
>
> warning: 21 lines add whitespace errors.
>
>
>
> On 4/18/22 17:28, Haowen Bai wrote:
>> As the tools/vm/page_owner_sort added some feature and original text
>> updated, sync the translation of zh_CN.
>>
>> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
>> ---
>> V1->V2: fix whitespace warning.
>> V2->V3: fix some tab Alignment issue.
>> V3->V4: fix sphinx warning
>>
>> 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..4d719547ce4f 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 <order> 指定排序顺序。排序语法是 [+|-]key[,[+|-]key[,...]]. 从
>> + **标准格式说明符** 部分选择一个键。"+" 是可选的,因为默认方向是增加数字或字典顺序。
>> + 允许混合使用缩写键和全称键。
>> +
>> + Examples:
>> + ./page_owner_sort <input> <output> --sort=n,+pid,-tgid
>> + ./page_owner_sort <input> <output> --sort=at
>>
>> 其它函数:
>>
>> Cull:
>> - -c 通过比较堆栈跟踪而不是总块来进行剔除。
>> + --cull <rules>
>> + 指定筛选规则。筛选语法是 key[,key[,...]]。在**标准格式说明符**部分选择一个多字母键
>> +
>> + <rules> 是逗号分隔列表形式的单个参数,它提供了一种指定单个筛选规则的方法。下面的**标准格式说明
>> + 符**部分描述了可识别的关键字。<rules> 可以由键 k1,k2, ... 顺序指定,如下面的
>> + STANDARD SORT KEYS 部分所述。允许混合使用缩写形式和完整形式的键。
>>
>> + Examples:
>> + ./page_owner_sort <input> <output> --cull=stacktrace
>> + ./page_owner_sort <input> <output> --cull=st,pid,name
>> + ./page_owner_sort <input> <output> --cull=n,f
>> Filter:
>> -f 过滤掉内存已被释放的块的信息。
>> +
>> + Select:
>> + --pid <pidlist> 通过 pid 进行选择。这将选择进程 ID 号出现在 <pidlist> 中的块。
>> + --tgid <tgidlist> 通过 tgid 进行选择。这将选择线程组 ID 号出现在 <tgidlist> 中的块。
>> + --name <cmdlist> 按任务名称选择。这将选择任务名称出现在 <cmdlist> 中的块。
>> +
>> + <pidlist>、<tgidlist>、<cmdlist>是逗号分隔列表形式的单参数,它提供了一种指定单个选择规则的方法。
>> +
>> +
>> + Examples:
>> + ./page_owner_sort <input> <output> --pid=1
>> + ./page_owner_sort <input> <output> --tgid=1,2,3
>> + ./page_owner_sort <input> <output> --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 Shi
yes, resend again. Thanks!
--
Haowen Bai
next prev parent reply other threads:[~2022-04-19 1:25 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 1:30 [PATCH V3] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst 司延腾
2022-04-15 2:09 ` yanteng si
2022-04-18 1:58 ` yanteng si
2022-04-18 9:28 ` [PATCH V4] " Haowen Bai
2022-04-18 12:41 ` Alex Shi
2022-04-19 1:23 ` Haowen Bai
2022-04-19 1:46 ` yanteng si
2022-04-19 2:07 ` [PATCH V5] " Haowen Bai
2022-04-19 2:33 ` yanteng si
2022-04-19 3:24 ` baihaowen
2022-04-19 3:34 ` [PATCH V6] " Haowen Bai
2022-04-19 4:27 ` [PATCH V5] " Alex Shi
2022-04-19 5:49 ` [PATCH V7] " Haowen Bai
2022-04-19 7:34 ` [PATCH V8] " Haowen Bai
2022-04-19 14:42 ` yanteng si
2022-04-20 3:06 ` [PATCH 0/2] " Haowen Bai
2022-04-20 3:06 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
2022-04-23 10:27 ` Alex Shi
2022-04-24 2:56 ` baihaowen
2022-04-24 3:16 ` Alex Shi
2022-04-25 1:17 ` baihaowen
2022-04-25 3:19 ` yanteng si
2022-04-25 8:18 ` baihaowen
2022-04-26 6:57 ` yanteng si
2022-04-26 8:20 ` Alex Shi
2022-04-26 8:23 ` baihaowen
[not found] ` <3f93bb0d-5658-f269-f8cc-d0a964ffb68b@gmail.com>
2022-04-26 8:30 ` baihaowen
2022-04-20 3:06 ` [PATCH 2/2] doc/vm/page_owner.rst: Fix table display confusion Haowen Bai
2022-04-20 12:31 ` Bagas Sanjaya
2022-04-20 12:46 ` Jonathan Corbet
2022-04-24 3:38 ` Akira Yokosawa
2022-04-24 5:24 ` Jonathan Corbet
2022-04-26 8:39 ` Alex Shi
2022-04-21 12:26 ` [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst yanteng si
2022-04-22 1:40 ` baihaowen
2022-04-22 2:35 ` Akira Yokosawa
2022-04-19 1:24 ` baihaowen [this message]
2022-04-18 9:29 ` [PATCH V3] docs/zh_CN: " baihaowen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c16eb087-8a29-fcdc-07b1-5624cdfdb4ec@meizu.com \
--to=baihaowen@meizu.com \
--cc=alexs@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=seakeel@gmail.com \
--cc=siyanteng01@gmail.com \
--cc=siyanteng@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).