All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst
@ 2022-04-26  7:07 Haowen Bai
  2022-04-26  7:07 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
                   ` (2 more replies)
  0 siblings, 3 replies; 18+ messages in thread
From: Haowen Bai @ 2022-04-26  7:07 UTC (permalink / raw)
  To: corbet, alexs, siyanteng01; +Cc: linux-kernel, linux-doc, siyanteng, Haowen Bai

This patches series will 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.

But the original text table which is made of tab will display all
by one line. so we make a standard table for STANDARD FORMAT SPECIFIERS
description. I fix it up togeter by this patches series.


Haowen Bai (2):
  docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  doc/vm/page_owner.rst: Fix table display confusion

 Documentation/translations/zh_CN/vm/page_owner.rst | 61 +++++++++++++++++++++-
 Documentation/vm/page_owner.rst                    | 34 +++++++-----
 2 files changed, 80 insertions(+), 15 deletions(-)

-- 
2.7.4


^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-26  7:07 [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst Haowen Bai
@ 2022-04-26  7:07 ` Haowen Bai
  2022-04-26  7:07 ` [PATCH 2/2] doc/vm/page_owner.rst: Fix table display confusion Haowen Bai
  2022-04-26 11:52 ` [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst Jonathan Corbet
  2 siblings, 0 replies; 18+ messages in thread
From: Haowen Bai @ 2022-04-26  7:07 UTC (permalink / raw)
  To: corbet, alexs, siyanteng01; +Cc: linux-kernel, linux-doc, siyanteng, Haowen Bai

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 <baihaowen@meizu.com>
---
 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 <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      页面分配的调用栈
+        ======          ==========      ==================
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 2/2] doc/vm/page_owner.rst: Fix table display confusion
  2022-04-26  7:07 [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst Haowen Bai
  2022-04-26  7:07 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
@ 2022-04-26  7:07 ` Haowen Bai
  2022-04-26 11:52 ` [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst Jonathan Corbet
  2 siblings, 0 replies; 18+ messages in thread
From: Haowen Bai @ 2022-04-26  7:07 UTC (permalink / raw)
  To: corbet, alexs, siyanteng01; +Cc: linux-kernel, linux-doc, siyanteng, Haowen Bai

After make htmldocs, the table which is made of tab will
display all by one line. so we make a standard table for STANDARD
FORMAT SPECIFIERS description.

Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
 Documentation/vm/page_owner.rst | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/Documentation/vm/page_owner.rst b/Documentation/vm/page_owner.rst
index 422d5fa99e84..a8505e3a3044 100644
--- a/Documentation/vm/page_owner.rst
+++ b/Documentation/vm/page_owner.rst
@@ -174,22 +174,28 @@ STANDARD FORMAT SPECIFIERS
 
 For --sort option:
 
-	KEY		LONG		DESCRIPTION
-	p		pid		process ID
-	tg		tgid		thread group ID
-	n		name		task command name
-	st		stacktrace	stack trace of the page allocation
-	T		txt		full text of block
-	ft		free_ts		timestamp of the page when it was released
-	at		alloc_ts	timestamp of the page when it was allocated
+        ====            ==========      ============================================
+        KEY             LONG            DESCRIPTION
+        ====            ==========      ============================================
+        p               pid             process ID
+        tg              tgid            thread group ID
+        n               name            task command name
+        st              stacktrace      stack trace of the page allocation
+        T               txt             full text of block
+        ft              free_ts         timestamp of the page when it was released
+        at              alloc_ts        timestamp of the page when it was allocated
         ator            allocator       memory allocator for pages
+        ====            ==========      ============================================
 
 For --curl option:
 
-	KEY		LONG		DESCRIPTION
-	p		pid		process ID
-	tg		tgid		thread group ID
-	n		name		task command name
-	f		free		whether the page has been released or not
-	st		stacktrace	stack trace of the page allocation
+        ====            ===========     ============================================
+        KEY             LONG            DESCRIPTION
+        ====            ===========     ============================================
+        p               pid             process ID
+        tg              tgid            thread group ID
+        n               name            task command name
+        f               free            whether the page has been released or not
+        st              stacktrace      stack trace of the page allocation
         ator            allocator       memory allocator for pages
+        ====            ===========     ============================================
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst
  2022-04-26  7:07 [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst Haowen Bai
  2022-04-26  7:07 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
  2022-04-26  7:07 ` [PATCH 2/2] doc/vm/page_owner.rst: Fix table display confusion Haowen Bai
@ 2022-04-26 11:52 ` Jonathan Corbet
  2 siblings, 0 replies; 18+ messages in thread
From: Jonathan Corbet @ 2022-04-26 11:52 UTC (permalink / raw)
  To: Haowen Bai, alexs, siyanteng01
  Cc: linux-kernel, linux-doc, siyanteng, Haowen Bai

Haowen Bai <baihaowen@meizu.com> writes:

> This patches series will sync the translation of zh_CN as below:

So I got two sets of these patches sent within minutes...so I'm not sure
what to do with them.  Why did you send them twice.

Additionally:

 - Please put a version number on your patch postings

 - A brief note (below the "---") line on what changed is helpful to
   reviewers and maintainers alike.

Thanks,

jon

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
       [not found]                 ` <3f93bb0d-5658-f269-f8cc-d0a964ffb68b@gmail.com>
@ 2022-04-26  8:30                   ` baihaowen
  0 siblings, 0 replies; 18+ messages in thread
From: baihaowen @ 2022-04-26  8:30 UTC (permalink / raw)
  To: Alex Shi, siyanteng01; +Cc: alexs, corbet, linux-doc, linux-kernel, siyanteng

在 4/26/22 4:29 PM, Alex Shi 写道:
>
>
> On 4/26/22 16:23, baihaowen wrote:
>>> Saving the patch email from many kind of email-clients as raw file, like thunderbird etc.
>>> Then using 'git am xxx.patch'. It will work. In fact, git can handle the plain email patch well.
>>>
>>>
>>>> It will notice 补丁格式检测失败。
>>>>
>> hi, Alex
>> I have sent you an available patch set, plz try to apply.
>
>
> Did you try your post by yourself? :)
>
>
>> -- Haowen Bai
YES.

-- 
Haowen Bai


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-26  8:20             ` Alex Shi
@ 2022-04-26  8:23               ` baihaowen
       [not found]                 ` <3f93bb0d-5658-f269-f8cc-d0a964ffb68b@gmail.com>
  0 siblings, 1 reply; 18+ messages in thread
From: baihaowen @ 2022-04-26  8:23 UTC (permalink / raw)
  To: Alex Shi, siyanteng01; +Cc: alexs, corbet, linux-doc, linux-kernel, siyanteng

在 4/26/22 4:20 PM, Alex Shi 写道:
>
> On 4/25/22 09:17, baihaowen wrote:
>> 在 4/24/22 11:16 AM, Alex Shi 写道:
>>> On 4/24/22 10:56, baihaowen wrote:
>>>>>> +        ======          ==========      ==================
>>>> 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.
>>> Send to yourself only then get it from your email client and try applying. 
>>>
>>> Thanks
>>> Alex
>> Hi Alex
>>
>> Could you tell me how do you do when you get a patch from email ?
>>
>> I get my patch from email and then copy-patse to a new file, then git am xx.patch.
> Don't do it. copy usually mess the format of patch.
>
> Saving the patch email from many kind of email-clients as raw file, like thunderbird etc.
> Then using 'git am xxx.patch'. It will work. In fact, git can handle the plain email patch well.
>
>
>> It will notice 补丁格式检测失败。
>>
hi, Alex
I have sent you an available patch set, plz try to apply.

-- 
Haowen Bai


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-25  1:17           ` baihaowen
  2022-04-25  3:19             ` yanteng si
@ 2022-04-26  8:20             ` Alex Shi
  2022-04-26  8:23               ` baihaowen
  1 sibling, 1 reply; 18+ messages in thread
From: Alex Shi @ 2022-04-26  8:20 UTC (permalink / raw)
  To: baihaowen, siyanteng01; +Cc: alexs, corbet, linux-doc, linux-kernel, siyanteng



On 4/25/22 09:17, baihaowen wrote:
> 在 4/24/22 11:16 AM, Alex Shi 写道:
>>
>> On 4/24/22 10:56, baihaowen wrote:
>>>>> +        ======          ==========      ==================
>>> 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.
>> Send to yourself only then get it from your email client and try applying. 
>>
>> Thanks
>> Alex
> Hi Alex
> 
> Could you tell me how do you do when you get a patch from email ?
> 
> I get my patch from email and then copy-patse to a new file, then git am xx.patch.

Don't do it. copy usually mess the format of patch.

Saving the patch email from many kind of email-clients as raw file, like thunderbird etc.
Then using 'git am xxx.patch'. It will work. In fact, git can handle the plain email patch well.


> It will notice 补丁格式检测失败。
> 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
       [not found] <1650956694-30699-1-git-send-email-baihaowen@meizu.com>
@ 2022-04-26  7:04 ` Haowen Bai
  0 siblings, 0 replies; 18+ messages in thread
From: Haowen Bai @ 2022-04-26  7:04 UTC (permalink / raw)
  To: Alex Shi, Jonathan Corbet; +Cc: Haowen Bai, linux-doc, linux-kernel

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 <baihaowen@meizu.com>
---
 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 <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      页面分配的调用栈
+        ======          ==========      ==================
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-25  8:18               ` baihaowen
@ 2022-04-26  6:57                 ` yanteng si
  0 siblings, 0 replies; 18+ messages in thread
From: yanteng si @ 2022-04-26  6:57 UTC (permalink / raw)
  To: baihaowen
  Cc: Alex Shi, Alex Shi, Jonathan Corbet, Linux Doc Mailing List,
	linux-kernel, Yanteng Si

baihaowen <baihaowen@meizu.com> 于2022年4月25日周一 16:20写道:
>
> 在 4/25/22 11:19 AM, yanteng si 写道:
> > baihaowen <baihaowen@meizu.com> 于2022年4月25日周一 09:17写道:
> >> 在 4/24/22 11:16 AM, Alex Shi 写道:
> >>> On 4/24/22 10:56, baihaowen wrote:
> >>>>>> +        ======          ==========      ==================
> >>>> 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.
> >>> Send to yourself only then get it from your email client and try applying.
> >>>
> >>> Thanks
> >>> Alex
> >> Hi Alex
> >>
> >> Could you tell me how do you do when you get a patch from email ?
> > $: git clone git://git.kernel.org/pub/scm/utils/b4/b4.git
> > $: b4/b4.sh am <message-id>
> > ###在你的邮箱里查看原始有邮件,然后找到message-id,贴过来就行,前提是你的补丁系列在lore里是按照前几天我说的那么弄。
> > $: vim xxxx.mbx   ### [modify your patch]
> > $: git am  xxxx.mbx
> >
> >
> > Thanks,
> > Yanteng
> >
> >> I get my patch from email and then copy-patse to a new file, then git am xx.patch.
> >> It will notice 补丁格式检测失败。
> >>
> >> --
> >> Haowen Bai
> >>
> hi, Yanteng
>
> No matter I select y or N, I could not git am the Chinese translation patch.
>
>     doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch
> Which 8bit encoding should I declare [UTF-8]? y
Git asked: What format encoding should I use, how about UTF-8?
You answer: Encode it in y .
> Are you sure you want to use <y> [y/N]? y
Git:You're kidding.
You:I'm serious.
Git:Ok, now, Content-Type: text/plain; charset="y".

I'm sorry. I played a joke. >_<

Haowen, You only need to press enter, not y or N.

Thanks,
Yanteng
>
>     doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch
> Which 8bit encoding should I declare [UTF-8]? N
> Are you sure you want to use <N> [y/N]? y
>
> $git am xxx.patch
> error: cannot convert from y to UTF-8
> fatal: could not parse patch
> or
> $git am xxx.patch
> error: cannot convert from N to UTF-8
> fatal: could not parse patch
>
> so, the problem is happening when I did git send-email, and the original zh_CN patch is successful for git am.
> Have you ever meet this problem ?
>
> --
> Haowen Bai
>

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-25  7:32 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
@ 2022-04-25 16:57   ` Jonathan Neuschäfer
  0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Neuschäfer @ 2022-04-25 16:57 UTC (permalink / raw)
  To: Haowen Bai; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 139 bytes --]

On Mon, Apr 25, 2022 at 03:32:10PM +0800, Haowen Bai wrote:
[...]
> +--curl 选项:

This should be --cull, not --curl.


Jonathan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-25  3:19             ` yanteng si
@ 2022-04-25  8:18               ` baihaowen
  2022-04-26  6:57                 ` yanteng si
  0 siblings, 1 reply; 18+ messages in thread
From: baihaowen @ 2022-04-25  8:18 UTC (permalink / raw)
  To: yanteng si
  Cc: Alex Shi, Alex Shi, Jonathan Corbet, Linux Doc Mailing List,
	linux-kernel, Yanteng Si

在 4/25/22 11:19 AM, yanteng si 写道:
> baihaowen <baihaowen@meizu.com> 于2022年4月25日周一 09:17写道:
>> 在 4/24/22 11:16 AM, Alex Shi 写道:
>>> On 4/24/22 10:56, baihaowen wrote:
>>>>>> +        ======          ==========      ==================
>>>> 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.
>>> Send to yourself only then get it from your email client and try applying.
>>>
>>> Thanks
>>> Alex
>> Hi Alex
>>
>> Could you tell me how do you do when you get a patch from email ?
> $: git clone git://git.kernel.org/pub/scm/utils/b4/b4.git
> $: b4/b4.sh am <message-id>
> ###在你的邮箱里查看原始有邮件,然后找到message-id,贴过来就行,前提是你的补丁系列在lore里是按照前几天我说的那么弄。
> $: vim xxxx.mbx   ### [modify your patch]
> $: git am  xxxx.mbx
>
>
> Thanks,
> Yanteng
>
>> I get my patch from email and then copy-patse to a new file, then git am xx.patch.
>> It will notice 补丁格式检测失败。
>>
>> --
>> Haowen Bai
>>
hi, Yanteng

No matter I select y or N, I could not git am the Chinese translation patch.

    doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch
Which 8bit encoding should I declare [UTF-8]? y
Are you sure you want to use <y> [y/N]? y

    doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch
Which 8bit encoding should I declare [UTF-8]? N
Are you sure you want to use <N> [y/N]? y

$git am xxx.patch
error: cannot convert from y to UTF-8
fatal: could not parse patch
or
$git am xxx.patch
error: cannot convert from N to UTF-8
fatal: could not parse patch

so, the problem is happening when I did git send-email, and the original zh_CN patch is successful for git am.
Have you ever meet this problem ?

-- 
Haowen Bai


^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-25  7:32 [PATCH 0/2] " Haowen Bai
@ 2022-04-25  7:32 ` Haowen Bai
  2022-04-25 16:57   ` Jonathan Neuschäfer
  0 siblings, 1 reply; 18+ messages in thread
From: Haowen Bai @ 2022-04-25  7:32 UTC (permalink / raw)
  To: baihaowen; +Cc: linux-kernel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="y", Size: 4911 bytes --]

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 <baihaowen@meizu.com>
---
 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 <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      页面分配的调用栈
+        ======          ==========      ==================
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-25  1:17           ` baihaowen
@ 2022-04-25  3:19             ` yanteng si
  2022-04-25  8:18               ` baihaowen
  2022-04-26  8:20             ` Alex Shi
  1 sibling, 1 reply; 18+ messages in thread
From: yanteng si @ 2022-04-25  3:19 UTC (permalink / raw)
  To: baihaowen
  Cc: Alex Shi, Alex Shi, Jonathan Corbet, Linux Doc Mailing List,
	linux-kernel, Yanteng Si

baihaowen <baihaowen@meizu.com> 于2022年4月25日周一 09:17写道:
>
> 在 4/24/22 11:16 AM, Alex Shi 写道:
> >
> > On 4/24/22 10:56, baihaowen wrote:
> >>>> +        ======          ==========      ==================
> >> 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.
> > Send to yourself only then get it from your email client and try applying.
> >
> > Thanks
> > Alex
> Hi Alex
>
> Could you tell me how do you do when you get a patch from email ?
$: git clone git://git.kernel.org/pub/scm/utils/b4/b4.git
$: b4/b4.sh am <message-id>
###在你的邮箱里查看原始有邮件,然后找到message-id,贴过来就行,前提是你的补丁系列在lore里是按照前几天我说的那么弄。
$: vim xxxx.mbx   ### [modify your patch]
$: git am  xxxx.mbx


Thanks,
Yanteng

>
> I get my patch from email and then copy-patse to a new file, then git am xx.patch.
> It will notice 补丁格式检测失败。
>
> --
> Haowen Bai
>

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-24  3:16         ` Alex Shi
@ 2022-04-25  1:17           ` baihaowen
  2022-04-25  3:19             ` yanteng si
  2022-04-26  8:20             ` Alex Shi
  0 siblings, 2 replies; 18+ messages in thread
From: baihaowen @ 2022-04-25  1:17 UTC (permalink / raw)
  To: Alex Shi, siyanteng01; +Cc: alexs, corbet, linux-doc, linux-kernel, siyanteng

在 4/24/22 11:16 AM, Alex Shi 写道:
>
> On 4/24/22 10:56, baihaowen wrote:
>>>> +        ======          ==========      ==================
>> 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.
> Send to yourself only then get it from your email client and try applying. 
>
> Thanks
> Alex
Hi Alex

Could you tell me how do you do when you get a patch from email ?

I get my patch from email and then copy-patse to a new file, then git am xx.patch.
It will notice 补丁格式检测失败。

-- 
Haowen Bai


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-24  2:56       ` baihaowen
@ 2022-04-24  3:16         ` Alex Shi
  2022-04-25  1:17           ` baihaowen
  0 siblings, 1 reply; 18+ messages in thread
From: Alex Shi @ 2022-04-24  3:16 UTC (permalink / raw)
  To: baihaowen, siyanteng01; +Cc: alexs, corbet, linux-doc, linux-kernel, siyanteng



On 4/24/22 10:56, baihaowen wrote:
>>> +        ======          ==========      ==================
> 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.

Send to yourself only then get it from your email client and try applying. 

Thanks
Alex

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-23 10:27     ` Alex Shi
@ 2022-04-24  2:56       ` baihaowen
  2022-04-24  3:16         ` Alex Shi
  0 siblings, 1 reply; 18+ messages in thread
From: baihaowen @ 2022-04-24  2:56 UTC (permalink / raw)
  To: Alex Shi, siyanteng01; +Cc: alexs, corbet, linux-doc, linux-kernel, siyanteng

在 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 <baihaowen@meizu.com>
>> ---
>>  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 <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
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


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  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
  0 siblings, 1 reply; 18+ messages in thread
From: Alex Shi @ 2022-04-23 10:27 UTC (permalink / raw)
  To: Haowen Bai, siyanteng01; +Cc: alexs, corbet, linux-doc, linux-kernel, siyanteng

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 <baihaowen@meizu.com>
> ---
>  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 <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      页面分配的调用栈
> +        ======          ==========      ==================

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
  2022-04-20  3:06 ` [PATCH 0/2] " Haowen Bai
@ 2022-04-20  3:06   ` Haowen Bai
  2022-04-23 10:27     ` Alex Shi
  0 siblings, 1 reply; 18+ messages in thread
From: Haowen Bai @ 2022-04-20  3:06 UTC (permalink / raw)
  To: siyanteng01
  Cc: alexs, baihaowen, corbet, linux-doc, linux-kernel, seakeel, siyanteng

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="N", Size: 4911 bytes --]

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 <baihaowen@meizu.com>
---
 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 <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      页面分配的调用栈
+        ======          ==========      ==================
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2022-04-26 11:52 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-26  7:07 [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst Haowen Bai
2022-04-26  7:07 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
2022-04-26  7:07 ` [PATCH 2/2] doc/vm/page_owner.rst: Fix table display confusion Haowen Bai
2022-04-26 11:52 ` [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst Jonathan Corbet
     [not found] <1650956694-30699-1-git-send-email-baihaowen@meizu.com>
2022-04-26  7:04 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
  -- strict thread matches above, loose matches on Subject: below --
2022-04-25  7:32 [PATCH 0/2] " Haowen Bai
2022-04-25  7:32 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
2022-04-25 16:57   ` Jonathan Neuschäfer
2022-04-19 14:42 [PATCH V8] " 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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.