[v3] common/rc: generalize _get_filesize()
diff mbox series

Message ID 20191016024803.12028-1-yuchao0@huawei.com
State New
Headers show
Series
  • [v3] common/rc: generalize _get_filesize()
Related show

Commit Message

Chao Yu Oct. 16, 2019, 2:48 a.m. UTC
There are some testcases use below command to get file size, generalize
it as global function _get_filesize()

ls -l $1 | $AWK_PROG '{print $5}'

And in addition, using more simple command "stat -c %s" instead.

- adjust common/defrag, generic/275 and generic/315 to use it
- remove unused _filesize in generic/013

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
v3:
- avoid unneeded echo command in _get_filesize() pointed out by Darrick.
 common/defrag     | 2 +-
 common/rc         | 5 +++++
 tests/generic/013 | 5 -----
 tests/generic/275 | 2 +-
 tests/generic/315 | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

Comments

Dave Chinner Oct. 16, 2019, 3:43 a.m. UTC | #1
On Wed, Oct 16, 2019 at 10:48:03AM +0800, Chao Yu wrote:
> There are some testcases use below command to get file size, generalize
> it as global function _get_filesize()
> 
> ls -l $1 | $AWK_PROG '{print $5}'
> 
> And in addition, using more simple command "stat -c %s" instead.
> 
> - adjust common/defrag, generic/275 and generic/315 to use it
> - remove unused _filesize in generic/013
> 
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
> v3:
> - avoid unneeded echo command in _get_filesize() pointed out by Darrick.
>  common/defrag     | 2 +-
>  common/rc         | 5 +++++
>  tests/generic/013 | 5 -----
>  tests/generic/275 | 2 +-
>  tests/generic/315 | 2 +-
>  5 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/common/defrag b/common/defrag
> index 1381a4dd..1769013b 100644
> --- a/common/defrag
> +++ b/common/defrag
> @@ -145,7 +145,7 @@ _defrag()
>  	STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1`
>  
>  	if [ $FSTYP == "f2fs" ]; then
> -		local filesize=`ls -l $1 | $AWK_PROG '{print $5}'`
> +		local filesize=`_get_filesize $1`
>  		$DEFRAG_PROG 0 $filesize $1 >> $seqres.full 2>&1
>  	else
>  		$DEFRAG_PROG -v $1 >> $seqres.full 2>&1
> diff --git a/common/rc b/common/rc
> index cfaabf10..8cdb7a9b 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -165,6 +165,11 @@ if [ ! -z "$REPORT_LIST" ]; then
>  	_assert_report_list
>  fi
>  
> +_get_filesize()
> +{
> +    stat -c %s "$1"
> +}

Also, all these should use _get_filesize():

$ git grep 'stat -c %s'
tests/btrfs/086:echo "bar file size after clone operation: $(stat -c %s $SCRATCH_MNT/bar)"
tests/generic/399:                      total_file_size=$((total_file_size + $(stat -c %s $file)))
tests/generic/399:      total_file_size=$((total_file_size + $(stat -c %s $file)))
tests/xfs/306:size=`stat -c %s $SCRATCH_MNT/file`
$ git grep 'stat -c "%s"'
tests/generic/286:      test $(stat -c "%s" $src) = $(stat -c "%s" $dest) ||
tests/generic/286:      test $(stat -c "%s" $src) = $(stat -c "%s" $dest) ||
tests/generic/286:      test $(stat -c "%s" $src) = $(stat -c "%s" $dest) ||
tests/generic/286:      test $(stat -c "%s" $src) = $(stat -c "%s" $dest) ||
tests/overlay/060:      actual_size=$(stat -c "%s" $target)
tests/xfs/014:  size=`stat -c "%s" $file`
tests/xfs/076:offset=`stat -c "%s" $SCRATCH_MNT/spc`


Cheers,

Dave.
Chao Yu Oct. 16, 2019, 6:29 a.m. UTC | #2
On 2019/10/16 11:43, Dave Chinner wrote:
> On Wed, Oct 16, 2019 at 10:48:03AM +0800, Chao Yu wrote:
>> There are some testcases use below command to get file size, generalize
>> it as global function _get_filesize()
>>
>> ls -l $1 | $AWK_PROG '{print $5}'
>>
>> And in addition, using more simple command "stat -c %s" instead.
>>
>> - adjust common/defrag, generic/275 and generic/315 to use it
>> - remove unused _filesize in generic/013
>>
>> Signed-off-by: Chao Yu <yuchao0@huawei.com>
>> ---
>> v3:
>> - avoid unneeded echo command in _get_filesize() pointed out by Darrick.
>>  common/defrag     | 2 +-
>>  common/rc         | 5 +++++
>>  tests/generic/013 | 5 -----
>>  tests/generic/275 | 2 +-
>>  tests/generic/315 | 2 +-
>>  5 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/common/defrag b/common/defrag
>> index 1381a4dd..1769013b 100644
>> --- a/common/defrag
>> +++ b/common/defrag
>> @@ -145,7 +145,7 @@ _defrag()
>>  	STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1`
>>  
>>  	if [ $FSTYP == "f2fs" ]; then
>> -		local filesize=`ls -l $1 | $AWK_PROG '{print $5}'`
>> +		local filesize=`_get_filesize $1`
>>  		$DEFRAG_PROG 0 $filesize $1 >> $seqres.full 2>&1
>>  	else
>>  		$DEFRAG_PROG -v $1 >> $seqres.full 2>&1
>> diff --git a/common/rc b/common/rc
>> index cfaabf10..8cdb7a9b 100644
>> --- a/common/rc
>> +++ b/common/rc
>> @@ -165,6 +165,11 @@ if [ ! -z "$REPORT_LIST" ]; then
>>  	_assert_report_list
>>  fi
>>  
>> +_get_filesize()
>> +{
>> +    stat -c %s "$1"
>> +}
> 
> Also, all these should use _get_filesize():

Oh, correct, I forgot to research with the new command... let me send v4 to
cover below lines.

Thanks for your reminder.

Thanks,

> 
> $ git grep 'stat -c %s'
> tests/btrfs/086:echo "bar file size after clone operation: $(stat -c %s $SCRATCH_MNT/bar)"
> tests/generic/399:                      total_file_size=$((total_file_size + $(stat -c %s $file)))
> tests/generic/399:      total_file_size=$((total_file_size + $(stat -c %s $file)))
> tests/xfs/306:size=`stat -c %s $SCRATCH_MNT/file`
> $ git grep 'stat -c "%s"'
> tests/generic/286:      test $(stat -c "%s" $src) = $(stat -c "%s" $dest) ||
> tests/generic/286:      test $(stat -c "%s" $src) = $(stat -c "%s" $dest) ||
> tests/generic/286:      test $(stat -c "%s" $src) = $(stat -c "%s" $dest) ||
> tests/generic/286:      test $(stat -c "%s" $src) = $(stat -c "%s" $dest) ||
> tests/overlay/060:      actual_size=$(stat -c "%s" $target)
> tests/xfs/014:  size=`stat -c "%s" $file`
> tests/xfs/076:offset=`stat -c "%s" $SCRATCH_MNT/spc`
> 
> 
> Cheers,
> 
> Dave.
>

Patch
diff mbox series

diff --git a/common/defrag b/common/defrag
index 1381a4dd..1769013b 100644
--- a/common/defrag
+++ b/common/defrag
@@ -145,7 +145,7 @@  _defrag()
 	STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1`
 
 	if [ $FSTYP == "f2fs" ]; then
-		local filesize=`ls -l $1 | $AWK_PROG '{print $5}'`
+		local filesize=`_get_filesize $1`
 		$DEFRAG_PROG 0 $filesize $1 >> $seqres.full 2>&1
 	else
 		$DEFRAG_PROG -v $1 >> $seqres.full 2>&1
diff --git a/common/rc b/common/rc
index cfaabf10..8cdb7a9b 100644
--- a/common/rc
+++ b/common/rc
@@ -165,6 +165,11 @@  if [ ! -z "$REPORT_LIST" ]; then
 	_assert_report_list
 fi
 
+_get_filesize()
+{
+    stat -c %s "$1"
+}
+
 _mount()
 {
     $MOUNT_PROG `_mount_ops_filter $*`
diff --git a/tests/generic/013 b/tests/generic/013
index 9e533ee8..bc596102 100755
--- a/tests/generic/013
+++ b/tests/generic/013
@@ -24,11 +24,6 @@  _cleanup()
     rm -rf $TEST_DIR/fsstress.$$.*
 }
 
-_filesize()
-{
-    ls -l $1 | $AWK_PROG '{print "    filesize = " $5}'
-}
-
 # get standard environment, filters and checks
 . ./common/rc
 . ./common/filter
diff --git a/tests/generic/275 b/tests/generic/275
index a934c19c..adc82856 100755
--- a/tests/generic/275
+++ b/tests/generic/275
@@ -73,7 +73,7 @@  echo "Bytes written until ENOSPC:" >>$seqres.full
 du $SCRATCH_MNT/tmp1 >>$seqres.full
 
 # And at least some of it should succeed.
-_filesize=`ls -l $SCRATCH_MNT/tmp1 | awk '{print $5}'`
+_filesize=`_get_filesize $SCRATCH_MNT/tmp1`
 [ $_filesize -lt $((128 * 1024)) ] && \
 	_fail "Partial write until enospc failed; wrote $_filesize bytes."
 
diff --git a/tests/generic/315 b/tests/generic/315
index fd49b579..808d7d74 100755
--- a/tests/generic/315
+++ b/tests/generic/315
@@ -52,7 +52,7 @@  $XFS_IO_PROG -f -c 'falloc -k 0 $(($avail_begin/2))' \
 	$TEST_DIR/testfile.$seq >>$seqres.full 2>&1
 
 # Verify the file size, it should keep unchanged as 0 in this case
-fsize=`ls -l $TEST_DIR/testfile.$seq | awk '{print $5}'`
+fsize=`_get_filesize $TEST_DIR/testfile.$seq`
 [ "$fsize" -eq 0 ] || _fail "File size is changed to ($fsize Bytes)"
 
 # Truncate the file size back to 0