Page MenuHomeFreeBSD

Fix output of swapinfo in human readable mode
ClosedPublic

Authored by csjp on Feb 19 2020, 5:16 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Feb 27, 9:46 PM
Unknown Object (File)
Tue, Feb 25, 8:16 PM
Unknown Object (File)
Sun, Feb 23, 5:47 PM
Unknown Object (File)
Feb 22 2025, 3:58 AM
Unknown Object (File)
Feb 22 2025, 1:16 AM
Unknown Object (File)
Feb 8 2025, 7:09 PM
Unknown Object (File)
Jan 26 2025, 5:09 AM
Unknown Object (File)
Dec 13 2024, 1:23 PM

Details

Summary
  • Implement -h (human readable) for the size of the underlying block disk. Currently, the size of the swap device is unconditionally reported using blocks, even if -h has been used.
  • While here, switch to CONVERT_BLOCKS() instead of CONVERT() which will avoid overflowing size counters (in human readable form see: r196244)
  • Update the column headers to reflect that a size is being reported instead of the block size units being used

I went back through the revision history and didn't see any reason why this was explicitly not done, but this seems more consistent to me.

Test Plan

Before:

$ swapinfo -h
Device 1K-blocks Used Avail Capacity
/dev/gpt/swapfs 1048576 0B 1.0G 0%
$

After:

$ swapinfo -h
Device Size Used Avail Capacity
/dev/gpt/swapfs 1.0G 0B 1.0G 0%
$

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable