diff options
| author | Ryan Zezeski <ryan@zinascii.com> | 2016-01-11 01:10:48 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2016-01-11 01:10:48 +0000 |
| commit | 931583b7c29efe8ef215cb94fe4173f1848fca6f (patch) | |
| tree | ee6e30948c14127fc624c62b436b0e0cb316c5d4 /usr | |
| parent | b55e77bf4830ec8f2514d54ee4de8c46d31844c9 (diff) | |
| download | illumos-joyent-931583b7c29efe8ef215cb94fe4173f1848fca6f.tar.gz | |
OS-5083 lx_proc /proc/swaps needs to try harder
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/uts/common/brand/lx/procfs/lx_prvnops.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c index ee7c77a87b..849cfa376b 100644 --- a/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c +++ b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c @@ -3899,6 +3899,9 @@ lxpr_read_stat(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf) * We don't support swap files or partitions, but some programs like to look * here just to check we have some swap on the system, so we lie and show * our entire swap cap as one swap partition. + * + * It is important to use formatting identical to the Linux implementation + * so that consumers do not break. See swap_show() in mm/swapfile.c. */ /* ARGSUSED */ static void @@ -3914,9 +3917,8 @@ lxpr_read_swaps(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf) mutex_exit(&zone->zone_mem_lock); lxpr_uiobuf_printf(uiobuf, - "Filename " - "Type Size Used Priority\n"); - lxpr_uiobuf_printf(uiobuf, "%-40s%-16s%-8llu%-8llu%-8d\n", + "Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n"); + lxpr_uiobuf_printf(uiobuf, "%-40s%s\t%llu\t%llu\t%d\n", "/dev/swap", "partition", totswap, usedswap, -1); } |