top: refer to memory using strict IEC standard names

Admittedly, top referred to memory quantities in
a variety of non-standard ways.  This commit brings
the program and supporting documentation into strict
compliance with IEC standard binary names.

According to wikipedia, as of 2012 this IEC standard
was still not in widespread use.  However, I'm making
this change now for the anal-retentive among us.

Reference:
http://en.wikipedia.org/wiki/Megabyte

Reported by: Roman Mamedov <rm@romanrm.ru>
Bug-Debian:  http://bugs.debian.org/662786

Signed-off-by: Jim Warner <james.warner@comcast.net>

diff --git a/top/top.1 b/top/top.1
index 6410c300b3f330b9cfaec388bae295c12acc9891..5c69f0d6873557297a22b10ae1a89576feb91b51 100644 (file)
--- a/top/top.1
+++ b/top/top.1
@@ -395,8 +395,8 @@ kernel versions are shown first.
 .\" ......................................................................
 .SS 2c. MEMORY Usage
 .\" ----------------------------------------------------------------------
-This portion consists of two lines which may express values in kilobytes (Kb),
-megabytes (Mb) or gigabytes (Gb) depending on the amount of currently
+This portion consists of two lines which may express values in kibibytes (KiB),
+mebibytes (MiB) or gibibytes (GiB) depending on the amount of currently
 installed \*(MP.
 
 Line 1 reflects \*(MP, classified as:
@@ -440,7 +440,7 @@ When displayed, it plus any other variable width columns will be allocated
 all remaining screen width (up to the maximum \*(WX characters).
 
 .TP 4
- 2.\fB CODE \*(Em Code Size (kb) \fR
+ 2.\fB CODE \*(Em Code Size (KiB) \fR
 The amount of \*(MP devoted to executable code, also known as
 the 'text resident set' size or TRS.
 
@@ -478,7 +478,7 @@ number of \*(PUs.
 You toggle 'Irix/Solaris' modes with the 'I' \*(CI.
 
 .TP 4
- 5.\fB DATA \*(Em Data + Stack Size (kb) \fR
+ 5.\fB DATA \*(Em Data + Stack Size (KiB) \fR
 The amount of \*(MP devoted to other than executable code, also known as
 the 'data resident set' size or DRS.
 
@@ -580,7 +580,7 @@ the operating itself was not preemptable.
 And while the 2.6 kernel can be made mostly preemptable, it is not always so.
 
 .TP 4
-20.\fB RES \*(Em Resident Memory Size (kb) \fR
+20.\fB RES \*(Em Resident Memory Size (KiB) \fR
 The non-swapped \*(MP a task has used.
 
 .TP 4
@@ -606,7 +606,7 @@ Even without a true SMP machine, you may see numerous tasks in this state
 depending on \*(We's delay interval and nice value.
 
 .TP 4
-24.\fB SHR \*(Em Shared Memory Size (kb) \fR
+24.\fB SHR \*(Em Shared Memory Size (KiB) \fR
 The amount of \*(MS available to a task, not all of which is
 typically resident.
 It simply reflects memory that could be potentially shared with
@@ -650,7 +650,7 @@ all remaining screen width (up to the maximum \*(WX characters).
 The\fI saved\fR user name.
 
 .TP 4
-30.\fB SWAP \*(Em Swapped Size (kb) \fR
+30.\fB SWAP \*(Em Swapped Size (KiB) \fR
 The non-resident portion of a task's address space.
 
 .TP 4
@@ -696,7 +696,7 @@ The\fI effective\fR user ID of the task's owner.
 The\fI effective\fR user name of the task's owner.
 
 .TP 4
-38.\fB VIRT \*(Em Virtual Memory Size (kb) \fR
+38.\fB VIRT \*(Em Virtual Memory Size (KiB) \fR
 The total amount of \*(MV used by the task.
 It includes all code, data and shared libraries plus pages that have been
 swapped out and pages that have been mapped but not used.

diff --git a/top/top_nls.c b/top/top_nls.c
index 0dc14c7284c3589d1f0c4cec03c8bd5e461d3cca..f4406adfb28dbdc1458531d10929b70de2d749fe 100644 (file)
--- a/top/top_nls.c
+++ b/top/top_nls.c
@@ -126,12 +126,12 @@ static void build_desc_nlstab (void) {
    Desc_nlstab[P_TME] = _("CPU Time");
    Desc_nlstab[P_TM2] = _("CPU Time, hundredths");
    Desc_nlstab[P_MEM] = _("Memory Usage (RES)");
-   Desc_nlstab[P_VRT] = _("Virtual Image (kb)");
-   Desc_nlstab[P_SWP] = _("Swapped Size (kb)");
-   Desc_nlstab[P_RES] = _("Resident Size (kb)");
-   Desc_nlstab[P_COD] = _("Code Size (kb)");
-   Desc_nlstab[P_DAT] = _("Data+Stack Size (kb)");
-   Desc_nlstab[P_SHR] = _("Shared Mem Size (kb)");
+   Desc_nlstab[P_VRT] = _("Virtual Image (KiB)");
+   Desc_nlstab[P_SWP] = _("Swapped Size (KiB)");
+   Desc_nlstab[P_RES] = _("Resident Size (KiB)");
+   Desc_nlstab[P_COD] = _("Code Size (KiB)");
+   Desc_nlstab[P_DAT] = _("Data+Stack (KiB)");
+   Desc_nlstab[P_SHR] = _("Shared Memory (KiB)");
    Desc_nlstab[P_FL1] = _("Major Page Faults");
    Desc_nlstab[P_FL2] = _("Minor Page Faults");
    Desc_nlstab[P_DRT] = _("Dirty Pages Count");
@@ -237,15 +237,15 @@ static void build_norm_nlstab (void) {
    Norm_nlstab[NOT_smp_cpus_txt] = _("Only 1 cpu detected");
    Norm_nlstab[BAD_integers_txt] = _("Unacceptable integer");
    Norm_nlstab[SELECT_clash_txt] = _("conflicting process selections (U/p/u)");
-/* Translation Hint: This is an abbreviation (limit 2 characters) for:
-   .                 kilobytes (1000 bytes) */
-   Norm_nlstab[AMT_kilobyte_txt] = _("Kb");
-/* Translation Hint: This is an abbreviation (limit 2 characters) for:
-   .                 megabytes (1,000,000 bytes) */
-   Norm_nlstab[AMT_megabyte_txt] = _("Mb");
-/* Translation Hint: This is an abbreviation (limit 2 characters) for:
-   .                 gigabytes (1,000,000,000 bytes) */
-   Norm_nlstab[AMT_gigabyte_txt] = _("Gb");
+/* Translation Hint: This is an abbreviation (limit 3 characters) for:
+   .                 kibibytes (1024 bytes) */
+   Norm_nlstab[AMT_kilobyte_txt] = _("KiB");
+/* Translation Hint: This is an abbreviation (limit 3 characters) for:
+   .                 mebibytes (1,048,576 bytes) */
+   Norm_nlstab[AMT_megabyte_txt] = _("MiB");
+/* Translation Hint: This is an abbreviation (limit 3 characters) for:
+   .                 gibibytes (1,073,741,824 bytes) */
+   Norm_nlstab[AMT_gigabyte_txt] = _("GiB");
    Norm_nlstab[WORD_threads_txt] = _("Threads");
    Norm_nlstab[WORD_process_txt] = _("Tasks");
 /* Translation Hint: The following "word" is meant to represent either a single