top: squashed 'scale_tics' catch-up for Ctrl-E scaling

[ the original newlib commit message(s) appear below ]

---------------------------------- newlib patch #1 ---
top: refactor 'scale_tics' function for better scaling

This patch refactors the 'scale_tics' function to more
closely parallel uptime shown on the first line of the
summary area. The old logic has been preserved through
the header file's new  #define SCALE_FORMER provision.

However, the former logic was actually a big disaster.
These are some potential problems with that old logic:

1. With respect to our time fields top no longer deals
solely with cpu time. So, the old limits of '68 weeks'
could possibly be insufficient to reflect those times.

2. Given the widths of top's new time fields, the code
never got beyond scaling to hours. For example, with a
ridiculously large span of 19 years, the scaled result
would then be shown as '167832h'. We never reached the
days ('6993d') or even the weeks ('999w') equivalents.

3. Similarly, with that 'TIME+' field and a large tics
value, results would then appear as 'MMMMMM:SS' rather
than the more meaningful 'HH:MM:SS' or days and hours.

So henceforth we will adopt these scaling conventions:

  MMM:SS.hh ... minutes:seconds.hundredths
  MMM:SS ...... minutes:seconds
  HH,MM ....... hours,minutes
  D+H ......... days+hours (with 'd' & 'h' suffixes)
  D ........... days (with 'd' suffix)
  W+D ......... weeks+days (with 'w' & 'd' suffixes)
  W ........... weeks (with 'w' suffix)

Note that, unlike our former scaling logic, that 'MMM'
portion won't be allowed to grow unconditionally. It's
limited (arbitrarily?) to 360 total minutes (6 hours).
Additionally, the 'HH' guy will be limited to 96 hours
(4 days) while that 'D' limit was set at 14 (2 weeks).

Whenever a limit is hit, scaling will advance a level.

---------------------------------- newlib patch #2 ---
top: extended 'scale_tics' function for Ctrl-E scaling

That normalization of the 'scale_tics' function in the
prior commit convinced me that I won't please everyone
with my arbitrary choices for the scaling transitions.

So, this patch will provide the users with a means for
setting their own scaling transition points with a new
toggle. Ctrl-E was chosen since the 'e/E' toggles were
already present as a means of scaling (albeit memory).

[ this toggle will also serve an educational purpose ]
[ by allowing one to see all the scaling conventions ]

The scaling a user establishes is saved in the rcfile.

---------------------------------- newlib patch #3 ---
top: enhanced 'scale_tics' function for Ctrl-E scaling

When scale_tics was refactored and then Ctrl-E support
added to top, the complete range of scaling values was
not visible. Namely, a single 'd' (days) & 'w' (weeks)
was never seen with ^E. With this commit they will be.

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

diff --git a/top/top.c b/top/top.c
index da6c9721f91d74f8c854c30936947c42c1aca016..ae34adeb3c7f19312d1624a8c942cd83adc26b6e 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -1728,39 +1728,55 @@ end_justifies:
 } // end: scale_pcnt
 
 
+#define TICS_AS_SECS  0
+#define TICS_AS_MINS  1
+#define TICS_AS_HOUR  2
+#define TICS_AS_DAY1  3
+#define TICS_AS_DAY2  4
+#define TICS_AS_WEEK  5
+#define TICS_AS_LAST  6
+
         /*
          * Do some scaling stuff.
-         * Format 'tics' to fit 'width', then justify it. */
-static const char *scale_tics (TIC_t tics, int width, int justr) {
+         * Try to format 'tics' to reach 'target' while also
+         * fitting in 'width', then justify it. */
+static const char *scale_tics (TIC_t tics, int width, int justr, int target) {
 #ifdef CASEUP_SUFIX
- #define HH "%uH"                                                  // nls_maybe
- #define DD "%uD"
- #define WW "%uW"
+ #define HH "%luH"                              // nls_maybe
+ #define DD "%luD"
+ #define WW "%luW"
 #else
- #define HH "%uh"                                                  // nls_maybe
- #define DD "%ud"
- #define WW "%uw"
+ #define HH "%luh"                              // nls_maybe
+ #define DD "%lud"
+ #define WW "%luw"
 #endif
    static char buf[SMLBUFSIZ];
-   unsigned long nt;    // narrow time, for speed on 32-bit
-   unsigned cc;         // centiseconds
-   unsigned nn;         // multi-purpose whatever
+   TIC_t nt;            // for speed on 64-bit
+#ifdef SCALE_FORMER
+   unsigned long cc;    // centiseconds
+   unsigned long nn;    // multi-purpose whatever
+#else
+   unsigned long cent, secs, mins, hour, days, week;
+#endif
 
    buf[0] = '\0';
-   nt  = (tics * 100ull) / Hertz;               // up to 68 weeks of cpu time
+   nt  = (tics * 100ull) / Hertz;               // lots of room for any time
    if (Rc.zero_suppress && 0 >= nt)
       goto end_justifies;
+
+#ifdef SCALE_FORMER
    cc  = nt % 100;                              // centiseconds past second
    nt /= 100;                                   // total seconds
    nn  = nt % 60;                               // seconds past the minute
    nt /= 60;                                    // total minutes
-   if (width >= snprintf(buf, sizeof(buf), "%lu:%02u.%02u", nt, nn, cc))
-      goto end_justifies;
-   if (width >= snprintf(buf, sizeof(buf), "%lu:%02u", nt, nn))
+   if (target < TICS_AS_MINS
+   && (width >= snprintf(buf, sizeof(buf), "%llu:%02lu.%02lu", nt, nn, cc)))
       goto end_justifies;
+   if (target < TICS_AS_HOUR
+   && (width >= snprintf(buf, sizeof(buf), "%llu:%02lu", nt, nn)))
    nn  = nt % 60;                               // minutes past the hour
    nt /= 60;                                    // total hours
-   if (width >= snprintf(buf, sizeof(buf), "%lu,%02u", nt, nn))
+   if (width >= snprintf(buf, sizeof(buf), "%llu,%02lu", nt, nn))
       goto end_justifies;
    nn = nt;                                     // now also hours
    if (width >= snprintf(buf, sizeof(buf), HH, nn))
@@ -1771,9 +1787,70 @@ static const char *scale_tics (TIC_t tics, int width, int justr) {
    nn /= 7;                                     // now weeks
    if (width >= snprintf(buf, sizeof(buf), WW, nn))
       goto end_justifies;
+#else
+ #define mmLIMIT 360                            // arbitrary 6 hours
+ #define hhLIMIT 96                             // arbitrary 4 days
+ #define ddLIMIT 14                             // arbitrary 2 weeks
+
+   cent = (nt % 100);                           // cent past secs
+   secs = (nt /= 100);                          // total secs
+   mins = (nt /= 60);                           // total mins
+   hour = (nt /= 60);                           // total hour
+   days = (nt /=  24);                          // totat days
+   week = (nt / 7);                             // total week
+
+   if (Rc.tics_scaled > target)
+      target += Rc.tics_scaled - target;
+
+   switch (target) {
+      case TICS_AS_SECS:
+         if (mins < mmLIMIT + 1) {
+            if (width >= snprintf(buf, sizeof(buf), "%lu:%02lu.%02lu", mins, secs % 60, cent))
+               goto end_justifies;
+         }
+      case TICS_AS_MINS:                        // fall through
+         if (mins < mmLIMIT + 1) {
+            if (width >= snprintf(buf, sizeof(buf), "%lu:%02lu", mins, secs % 60))
+               goto end_justifies;
+         }
+      case TICS_AS_HOUR:                        // fall through
+         if (hour < hhLIMIT + 1) {
+            if (width >= snprintf(buf, sizeof(buf), "%lu,%02lu", hour, mins % 60))
+               goto end_justifies;
+         }
+      case TICS_AS_DAY1:                        // fall through
+         if (days < ddLIMIT + 1) {
+            if (width >= snprintf(buf, sizeof(buf), DD "+" HH, days, hour % 24))
+               goto end_justifies;
+#ifdef SCALE_POSTFX
+            if (width >= snprintf(buf, sizeof(buf), DD "+%lu", days, hour % 24))
+               goto end_justifies;
+#endif
+      case TICS_AS_DAY2:                        // fall through
+            if (width >= snprintf(buf, sizeof(buf), DD, days))
+               goto end_justifies;
+         }
+      case TICS_AS_WEEK:                        // fall through
+         if (width >= snprintf(buf, sizeof(buf), WW "+" DD, week, days % 7))
+            goto end_justifies;
+#ifdef SCALE_POSTFX
+         if (width >= snprintf(buf, sizeof(buf), WW "+%lu", week, days % 7))
+            goto end_justifies;
+#endif
+      case TICS_AS_LAST:                        // fall through
+         if (width >= snprintf(buf, sizeof(buf), WW, week))
+            goto end_justifies;
+      default:                                  // fall through
+         break;
+   }
+ #undef mmLIMIT
+ #undef hhLIMIT
+ #undef ddLIMIT
+#endif
 
    // well shoot, this outta' fit...
    snprintf(buf, sizeof(buf), "?");
+
 end_justifies:
    return justify_pad(buf, width, justr);
  #undef HH
@@ -4034,7 +4111,9 @@ static const char *configs_file (FILE *fp, const char *name, float *delay) {
          case 'i':                          // from 3.3.10 thru 3.3.16
             scat(w->rc.fieldscur, RCF_PLUS_J);
          // fall through
-         case 'j':                          // current RCF_VERSION_ID
+         case 'j':                          // this is release 3.3.17
+            Rc.tics_scaled = 0;
+         case 'k':                          // current RCF_VERSION_ID
          default:
             if (strlen(w->rc.fieldscur) != sizeof(DEF_FIELDS) - 1)
                return p;
@@ -4054,8 +4133,8 @@ static const char *configs_file (FILE *fp, const char *name, float *delay) {
    } // end: for (GROUPSMAX)
 
    // any new addition(s) last, for older rcfiles compatibility...
-   (void)fscanf(fp, "Fixed_widest=%d, Summ_mscale=%d, Task_mscale=%d, Zero_suppress=%d\n"
-      , &Rc.fixed_widest, &Rc.summ_mscale, &Rc.task_mscale, &Rc.zero_suppress);
+   (void)fscanf(fp, "Fixed_widest=%d, Summ_mscale=%d, Task_mscale=%d, Zero_suppress=%d, Tics_scaled=%d\n"
+      , &Rc.fixed_widest, &Rc.summ_mscale, &Rc.task_mscale, &Rc.zero_suppress,  &Rc.tics_scaled);
    if (Rc.fixed_widest < -1 || Rc.fixed_widest > SCREENMAX)
       Rc.fixed_widest = 0;
    if (Rc.summ_mscale < 0   || Rc.summ_mscale > SK_Eb)
@@ -4064,6 +4143,8 @@ static const char *configs_file (FILE *fp, const char *name, float *delay) {
       Rc.task_mscale = 0;
    if (Rc.zero_suppress < 0 || Rc.zero_suppress > 1)
       Rc.zero_suppress = 0;
+   if (Rc.tics_scaled < 0 || Rc.tics_scaled > TICS_AS_LAST)
+      Rc.tics_scaled = 0;
 
    // prepare to warn that older top can no longer read rcfile ...
    if (Rc.id != RCF_VERSION_ID)
@@ -4441,7 +4522,10 @@ static void win_reset (WIN_t *q) {
 #else
          q->rc.maxtasks = q->usrseltyp = q->begpflg = q->begtask = q->begnext = q->focus_pid = 0;
 #endif
+         // these next two are global, not really windows based
          Monpidsidx = 0;
+         Rc.tics_scaled = 0;
+
          osel_clear(q);
          q->findstr[0] = '\0';
 #ifndef USE_X_COLHDR
@@ -5166,8 +5250,8 @@ static void write_rcfile (void) {
    }
 
    // any new addition(s) last, for older rcfiles compatibility...
-   fprintf(fp, "Fixed_widest=%d, Summ_mscale=%d, Task_mscale=%d, Zero_suppress=%d\n"
-      , Rc.fixed_widest, Rc.summ_mscale, Rc.task_mscale, Rc.zero_suppress);
+   fprintf(fp, "Fixed_widest=%d, Summ_mscale=%d, Task_mscale=%d, Zero_suppress=%d, Tics_scaled=%d\n"
+      , Rc.fixed_widest, Rc.summ_mscale, Rc.task_mscale, Rc.zero_suppress, Rc.tics_scaled);
 
    if (Winstk[0].osel_tot + Winstk[1].osel_tot
      + Winstk[2].osel_tot + Winstk[3].osel_tot) {
@@ -5320,6 +5404,13 @@ static void keys_global (int ch) {
       case '0':
          Rc.zero_suppress = !Rc.zero_suppress;
          break;
+      case kbd_CtrlE:
+#ifndef SCALE_FORMER
+         Rc.tics_scaled++;
+         if (Rc.tics_scaled > TICS_AS_LAST)
+            Rc.tics_scaled = 0;
+#endif
+         break;
       case kbd_ENTER:             // these two have the effect of waking us
       case kbd_SPACE:             // from 'pselect', refreshing the display
          break;                   // and updating any hot-plugged resources
@@ -6134,7 +6225,7 @@ static void do_key (int ch) {
       { keys_global,
          { '?', 'B', 'd', 'E', 'e', 'f', 'g', 'H', 'h'
          , 'I', 'k', 'r', 's', 'X', 'Y', 'Z', '0'
-         , kbd_ENTER, kbd_SPACE, '\0' } },
+         , kbd_CtrlE, kbd_ENTER, kbd_SPACE, '\0' } },
       { keys_summary,
          { '!', '1', '2', '3', '4', 'C', 'l', 'm', 't', '\0' } },
       { keys_task,
@@ -6446,7 +6537,7 @@ static const char *task_show (const WIN_t *q, const int idx) {
          case EU_TME:
          {  TIC_t t = p->utime + p->stime;
             if (CHKw(q, Show_CTIMES)) t += (p->cutime + p->cstime);
-            cp = scale_tics(t, W, Jn);
+            cp = scale_tics(t, W, Jn, TICS_AS_SECS);
          }
             break;
          case EU_TPG:

diff --git a/top/top.h b/top/top.h
index a41755c4a2ef81e5049344321b5b5c6f508c4af1..94799bdf5d6adae1e532cf4a2f52241b3b4c634b 100644 (file)
--- a/top/top.h
+++ b/top/top.h
@@ -56,6 +56,8 @@
 //#define RCFILE_NOERR            /* rcfile errs silently default, vs. fatal */
 //#define RECALL_FIXED            /* don't reorder saved strings if recalled */
 //#define RMAN_IGNORED            /* don't consider auto right margin glitch */
+//#define SCALE_FORMER            /* scale_tics() guy shouldn't mimic uptime */
+//#define SCALE_POSTFX            /* scale_tics() try without a 'h,d' suffix */
 //#define SCROLLVAR_NO            /* disable intra-column horizontal scrolls */
 //#define SCROLLV_BY_1            /* when scrolling left/right do not move 8 */
 //#define STRINGCASENO            /* case insenstive compare/locate versions */
@@ -181,6 +183,7 @@ char *strcasestr(const char *haystack, const char *needle);
 #define kbd_INS    138
 #define kbd_DEL    139
 #define kbd_CtrlO  '\017'
+#define kbd_CtrlE  '\005'
 
         /* Special value in Pseudo_row to force an additional procs refresh
            -- used at startup and for task/thread mode transitions */
@@ -402,6 +405,7 @@ typedef struct RCF_t {
    int    summ_mscale;          // 'E' - scaling of summary memory values
    int    task_mscale;          // 'e' - scaling of process memory values
    int    zero_suppress;        // '0' - suppress scaled zeros toggle
+   int    tics_scaled;          // ^E  - scale TIME and/or TIME+ columns
 } RCF_t;
 
         /* This structure stores configurable information for each window.
@@ -616,7 +620,7 @@ typedef struct WIN_t {
 #define RCF_EYECATCHER  "Config File (Linux processes with windows)\n"
 #define RCF_PLUS_H      "\\]^_`abcdefghij"
 #define RCF_PLUS_J      "klmnopqrstuvwxyz"
-#define RCF_VERSION_ID  'j'
+#define RCF_VERSION_ID  'k'
 
         /* The default fields displayed and their order, if nothing is
            specified by the loser, oops user.
@@ -657,7 +661,7 @@ typedef struct WIN_t {
    { EU_UEN, ALT_WINFLGS, 0, ALT_GRAPHS2, 0, 0, \
       COLOR_YELLOW, COLOR_YELLOW, COLOR_GREEN, COLOR_YELLOW, \
       "Usr", USR_FIELDS } \
-   }, 0, DEF_SCALES2, 0 }
+   }, 0, DEF_SCALES2, 0, 0 }
 
         /* Summary Lines specially formatted string(s) --
            see 'show_special' for syntax details + other cautions. */
@@ -683,7 +687,9 @@ typedef struct WIN_t {
 #if defined(MEMGRAPH_OLD)
 # warning 'MEMGRAPH_OLD' will make the man document Section 2c. misleading
 #endif
-
+#if defined(SCALE_FORMER) && defined(SCALE_POSTFX)
+# warning 'SCALE_POSTFX' is ignored when 'SCALE_FORMER' is active
+#endif
 
 /*######  Some Prototypes (ha!)  #########################################*/
 
@@ -742,7 +748,7 @@ typedef struct WIN_t {
 //atic const char   *scale_mem (int target, float num, int width, int justr);
 //atic const char   *scale_num (float num, int width, int justr);
 //atic const char   *scale_pcnt (float num, int width, int justr);
-//atic const char   *scale_tics (TIC_t tics, int width, int justr);
+//atic const char   *scale_tics (TIC_t tics, int width, int justr, int target);
 /*------  Fields Management support  -------------------------------------*/
 /*atic FLD_t         Fieldstab[] = { ... }                                */
 //atic void          adj_geometry (void);

diff --git a/top/top_nls.c b/top/top_nls.c
index 70a8803431f249c6217e21a8464fad95f4b2a524..f5558f7daca43741aa24addcaf311b59814f9cd1 100644 (file)
--- a/top/top_nls.c
+++ b/top/top_nls.c
@@ -587,7 +587,7 @@ static void build_uniq_nlstab (void) {
       "  V,v,F   . Toggle: '~1V~2' forest view; '~1v~2' hide/show children; '~1F~2' keep focused\n"
       "\n"
       "%s"
-      "  W,Y,!     Write config file '~1W~2'; Inspect other output '~1Y~2'; Combine Cpus '~1!~2'\n"
+      "  W,Y,!,^E  Write cfg '~1W~2'; Inspect '~1Y~2'; Combine Cpus '~1!~2'; Scale time ~1Ctrl~2+'~1E~2'\n"
       "  q         Quit\n"
       "          ( commands shown with '.' require a ~1visible~2 task display ~1window~2 ) \n"
       "Press '~1h~2' or '~1?~2' for help with ~1Windows~2,\n"