[LTP] [PATCH] memcg_move_charge_at_immigrate_test: fix a bug of usage_in_bytes is not 'exact'

[LTP] [PATCH] memcg_move_charge_at_immigrate_test: fix a bug of usage_in_bytes is not 'exact'

[Peng Haitao]

In memory.txt says:
 usage_in_bytes is affected by the method and doesn't show 'exact' value of memory(and swap) usage, it's an fuzz value for efficient access. (Of course, when necessary, it's synchronized.) If you want to know more exact memory usage, you should use RSS+CACHE(+SWAP) value in memory.stat(see 5.2).

So memory.usage_in_bytes should be replaced with memory.stat in the case of
memcg_move_charge_at_immigrate_test.

Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>
---
 testcases/kernel/controllers/memcg/functional/memcg_lib.sh     |    6 ++++--
 .../memcg/functional/memcg_move_charge_at_immigrate_test.sh    |    8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
index 470932d..fd2c7fd 100755
--- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
@@ -380,9 +380,11 @@ test_move_charge()
 	echo $! > subgroup_b/tasks
 
 	cd subgroup_b
-	check_mem_stat memory.usage_in_bytes $4
+	check_mem_stat "rss" $4
+	check_mem_stat "cache" $5
 	cd ../subgroup_a
-	check_mem_stat memory.usage_in_bytes $5
+	check_mem_stat "rss" $6
+	check_mem_stat "cache" $7
 
 	cd ..
 	echo $! > tasks
diff --git a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
index fb639c7..cf2c603 100755
--- a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
+++ b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
@@ -35,27 +35,27 @@ export TST_COUNT=0
 # Test disable moving charges
 testcase_1()
 {
-	test_move_charge "--mmap-anon" $PAGESIZE  0 0 $PAGESIZE
+	test_move_charge "--mmap-anon" $PAGESIZE  0 0 0 $PAGESIZE 0
 }
 
 # Test move anon
 testcase_2()
 {
 	test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 1 \
-		$PAGESIZE $((PAGESIZE*2))
+		$PAGESIZE 0 0 $((PAGESIZE*2))
 }
 
 # Test move file
 testcase_3()
 {
 	test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 2 \
-		$((PAGESIZE*2)) $PAGESIZE
+		0 $((PAGESIZE*2)) $PAGESIZE 0
 }
 
 # Test move anon and file
 testcase_4()
 {
-	test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $((PAGESIZE*2)) 0
+	test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $PAGESIZE $PAGESIZE 0 0
 }
 
 # Run all the test cases
-- 
1.7.10


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] memcg_move_charge_at_immigrate_test: fix a bug of usage_in_bytes is not 'exact'

[Wanlong Gao]

On 04/24/2012 03:43 PM, Peng Haitao wrote:

> In memory.txt says:
>  usage_in_bytes is affected by the method and doesn't show 'exact' value of memory(and swap) usage, it's an fuzz value for efficient access. (Of course, when necessary, it's synchronized.) If you want to know more exact memory usage, you should use RSS+CACHE(+SWAP) value in memory.stat(see 5.2).
> 
> So memory.usage_in_bytes should be replaced with memory.stat in the case of
> memcg_move_charge_at_immigrate_test.
> 
> Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>


pushed, thanks Peng,

Wanlong Gao

> ---
>  testcases/kernel/controllers/memcg/functional/memcg_lib.sh     |    6 ++++--
>  .../memcg/functional/memcg_move_charge_at_immigrate_test.sh    |    8 ++++----
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> index 470932d..fd2c7fd 100755
> --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> @@ -380,9 +380,11 @@ test_move_charge()
>  	echo $! > subgroup_b/tasks
>  
>  	cd subgroup_b
> -	check_mem_stat memory.usage_in_bytes $4
> +	check_mem_stat "rss" $4
> +	check_mem_stat "cache" $5
>  	cd ../subgroup_a
> -	check_mem_stat memory.usage_in_bytes $5
> +	check_mem_stat "rss" $6
> +	check_mem_stat "cache" $7
>  
>  	cd ..
>  	echo $! > tasks
> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
> index fb639c7..cf2c603 100755
> --- a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
> +++ b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
> @@ -35,27 +35,27 @@ export TST_COUNT=0
>  # Test disable moving charges
>  testcase_1()
>  {
> -	test_move_charge "--mmap-anon" $PAGESIZE  0 0 $PAGESIZE
> +	test_move_charge "--mmap-anon" $PAGESIZE  0 0 0 $PAGESIZE 0
>  }
>  
>  # Test move anon
>  testcase_2()
>  {
>  	test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 1 \
> -		$PAGESIZE $((PAGESIZE*2))
> +		$PAGESIZE 0 0 $((PAGESIZE*2))
>  }
>  
>  # Test move file
>  testcase_3()
>  {
>  	test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 2 \
> -		$((PAGESIZE*2)) $PAGESIZE
> +		0 $((PAGESIZE*2)) $PAGESIZE 0
>  }
>  
>  # Test move anon and file
>  testcase_4()
>  {
> -	test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $((PAGESIZE*2)) 0
> +	test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $PAGESIZE $PAGESIZE 0 0
>  }
>  
>  # Run all the test cases



------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] memcg_move_charge_at_immigrate_test: fix a bug of usage_in_bytes is not 'exact'

[Caspar Zhang]

On 04/25/2012 11:06 AM, Wanlong Gao wrote:
> On 04/24/2012 03:43 PM, Peng Haitao wrote:
> 
>> In memory.txt says:
>>  usage_in_bytes is affected by the method and doesn't show 'exact' value of memory(and swap) usage, it's an fuzz value for efficient access. (Of course, when necessary, it's synchronized.) If you want to know more exact memory usage, you should use RSS+CACHE(+SWAP) value in memory.stat(see 5.2).
>>
>> So memory.usage_in_bytes should be replaced with memory.stat in the case of
>> memcg_move_charge_at_immigrate_test.

Hi, Please break your commit message into <= 73 words per line (except
some running output) next time.

Thanks,
Caspar

>>
>> Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>
> 
> 
> pushed, thanks Peng,
> 
> Wanlong Gao
> 
>> ---
>>  testcases/kernel/controllers/memcg/functional/memcg_lib.sh     |    6 ++++--
>>  .../memcg/functional/memcg_move_charge_at_immigrate_test.sh    |    8 ++++----
>>  2 files changed, 8 insertions(+), 6 deletions(-)
>>
>> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
>> index 470932d..fd2c7fd 100755
>> --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
>> +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
>> @@ -380,9 +380,11 @@ test_move_charge()
>>  	echo $! > subgroup_b/tasks
>>  
>>  	cd subgroup_b
>> -	check_mem_stat memory.usage_in_bytes $4
>> +	check_mem_stat "rss" $4
>> +	check_mem_stat "cache" $5
>>  	cd ../subgroup_a
>> -	check_mem_stat memory.usage_in_bytes $5
>> +	check_mem_stat "rss" $6
>> +	check_mem_stat "cache" $7
>>  
>>  	cd ..
>>  	echo $! > tasks
>> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
>> index fb639c7..cf2c603 100755
>> --- a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
>> +++ b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
>> @@ -35,27 +35,27 @@ export TST_COUNT=0
>>  # Test disable moving charges
>>  testcase_1()
>>  {
>> -	test_move_charge "--mmap-anon" $PAGESIZE  0 0 $PAGESIZE
>> +	test_move_charge "--mmap-anon" $PAGESIZE  0 0 0 $PAGESIZE 0
>>  }
>>  
>>  # Test move anon
>>  testcase_2()
>>  {
>>  	test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 1 \
>> -		$PAGESIZE $((PAGESIZE*2))
>> +		$PAGESIZE 0 0 $((PAGESIZE*2))
>>  }
>>  
>>  # Test move file
>>  testcase_3()
>>  {
>>  	test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 2 \
>> -		$((PAGESIZE*2)) $PAGESIZE
>> +		0 $((PAGESIZE*2)) $PAGESIZE 0
>>  }
>>  
>>  # Test move anon and file
>>  testcase_4()
>>  {
>> -	test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $((PAGESIZE*2)) 0
>> +	test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $PAGESIZE $PAGESIZE 0 0
>>  }
>>  
>>  # Run all the test cases
> 
> 
> 
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Ltp-list mailing list
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] memcg_move_charge_at_immigrate_test: fix a bug of usage_in_bytes is not 'exact'

[Caspar Zhang]

On 04/25/2012 11:32 AM, Caspar Zhang wrote:
> On 04/25/2012 11:06 AM, Wanlong Gao wrote:
>> On 04/24/2012 03:43 PM, Peng Haitao wrote:
>>
>>> In memory.txt says:
>>>  usage_in_bytes is affected by the method and doesn't show 'exact' value of memory(and swap) usage, it's an fuzz value for efficient access. (Of course, when necessary, it's synchronized.) If you want to know more exact memory usage, you should use RSS+CACHE(+SWAP) value in memory.stat(see 5.2).
>>>
>>> So memory.usage_in_bytes should be replaced with memory.stat in the case of
>>> memcg_move_charge_at_immigrate_test.
> 
> Hi, Please break your commit message into <= 73 words per line (except

sorry, s/words/characters...

> some running output) next time.
> 
> Thanks,
> Caspar

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] memcg_move_charge_at_immigrate_test: fix a bug of usage_in_bytes is not 'exact'

[Peng Haitao]

Caspar Zhang said the following on 2012-4-25 11:32:
>>> In memory.txt says:
>>>  usage_in_bytes is affected by the method and doesn't show 'exact' value of memory(and swap) usage, it's an fuzz value for efficient access. (Of course, when necessary, it's synchronized.) If you want to know more exact memory usage, you should use RSS+CACHE(+SWAP) value in memory.stat(see 5.2).
>>>
>>> So memory.usage_in_bytes should be replaced with memory.stat in the case of
>>> memcg_move_charge_at_immigrate_test.
> 
> Hi, Please break your commit message into <= 73 words per line (except
> some running output) next time.
> 

Sorry，I see。

Thanks。

-- 
Best Regards,
Peng

> Thanks,
> Caspar
> 
>>>
>>> Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>
>>
>>
>> pushed, thanks Peng,
>>
>> Wanlong Gao
>>
>>> ---
>>>  testcases/kernel/controllers/memcg/functional/memcg_lib.sh     |    6 ++++--
>>>  .../memcg/functional/memcg_move_charge_at_immigrate_test.sh    |    8 ++++----
>>>  2 files changed, 8 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
>>> index 470932d..fd2c7fd 100755
>>> --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
>>> +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
>>> @@ -380,9 +380,11 @@ test_move_charge()
>>>  	echo $! > subgroup_b/tasks
>>>  
>>>  	cd subgroup_b
>>> -	check_mem_stat memory.usage_in_bytes $4
>>> +	check_mem_stat "rss" $4
>>> +	check_mem_stat "cache" $5
>>>  	cd ../subgroup_a
>>> -	check_mem_stat memory.usage_in_bytes $5
>>> +	check_mem_stat "rss" $6
>>> +	check_mem_stat "cache" $7
>>>  
>>>  	cd ..
>>>  	echo $! > tasks
>>> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
>>> index fb639c7..cf2c603 100755
>>> --- a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
>>> +++ b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
>>> @@ -35,27 +35,27 @@ export TST_COUNT=0
>>>  # Test disable moving charges
>>>  testcase_1()
>>>  {
>>> -	test_move_charge "--mmap-anon" $PAGESIZE  0 0 $PAGESIZE
>>> +	test_move_charge "--mmap-anon" $PAGESIZE  0 0 0 $PAGESIZE 0
>>>  }
>>>  
>>>  # Test move anon
>>>  testcase_2()
>>>  {
>>>  	test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 1 \
>>> -		$PAGESIZE $((PAGESIZE*2))
>>> +		$PAGESIZE 0 0 $((PAGESIZE*2))
>>>  }
>>>  
>>>  # Test move file
>>>  testcase_3()
>>>  {
>>>  	test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 2 \
>>> -		$((PAGESIZE*2)) $PAGESIZE
>>> +		0 $((PAGESIZE*2)) $PAGESIZE 0
>>>  }
>>>  
>>>  # Test move anon and file
>>>  testcase_4()
>>>  {
>>> -	test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $((PAGESIZE*2)) 0
>>> +	test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $PAGESIZE $PAGESIZE 0 0
>>>  }
>>>  
>>>  # Run all the test cases
>>
>>
>>
>> ------------------------------------------------------------------------------
>> Live Security Virtual Conference
>> Exclusive live event will cover all the ways today's security and 
>> threat landscape has changed and how IT managers can respond. Discussions 
>> will include endpoint security, mobile security and the latest in malware 
>> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
>> _______________________________________________
>> Ltp-list mailing list
>> Ltp-list@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/ltp-list
> 
> 
> 



------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list