pidstat stack utilization statistics were not always properly refreshed

Stack utilization statistics displayed by "pidstat -s" were sometimes
not displayed for some processes although values had changed.
This was because stack stats were displayed together with memory stats,
but pidstat was looking only for a variation in memory counters values
to decide whether to display the corresponding process or not.
So now process memory and stack statistics independently.

Signed-off-by: Sebastien GODARD <sysstat@orange.fr.fake>

diff --git a/pidstat.c b/pidstat.c
index 852ebd29da7ecce914f58d363544a9fcbe31bb9d..1e208229d27edeaa43079765eed570eae9c21e06 100644 (file)
--- a/pidstat.c
+++ b/pidstat.c
@@ -1070,6 +1070,14 @@ int get_pid_to_display(int prev, int curr, int p, unsigned int activity,
                                }
                        }
 
+
+                       if (DISPLAY_STACK(activity) && (!isActive)) {
+                               if (((*pstc)->stack_size  != (*pstp)->stack_size) ||
+                                   ((*pstc)->stack_ref != (*pstp)->stack_ref)) {
+                                       isActive = TRUE;
+                               }
+                       }
+
                        if (DISPLAY_IO(activity) && (!isActive) &&
                                 /* /proc/#/io file should exist to check I/O stats */
                                 !(NO_PID_IO((*pstc)->flags))) {
@@ -1080,7 +1088,7 @@ int get_pid_to_display(int prev, int curr, int p, unsigned int activity,
                                        isActive = TRUE;
                                }
                        }
-                       
+
                        if (DISPLAY_CTXSW(activity) && (!isActive)) {
                                if (((*pstc)->nvcsw  != (*pstp)->nvcsw) ||
                                    ((*pstc)->nivcsw != (*pstp)->nivcsw)) {
@@ -1276,7 +1284,7 @@ int write_pid_task_all_stats(int prev, int curr, int dis,
                }
 
                if (DISPLAY_STACK(actflag)) {
-                       printf("  %6lu  %6lu",
+                       printf(" %7lu %7lu",
                               pstc->stack_size,
                               pstc->stack_ref);
                }
@@ -1550,7 +1558,7 @@ int write_pid_child_cpu_stats(int prev, int curr, int dis, int disp_avg,
 
 /*
  ***************************************************************************
- * Display memory and/or stack size statistics for tasks.
+ * Display memory statistics for tasks.
  *
  * IN:
  * @prev       Index in array where stats used as reference are.
@@ -1580,13 +1588,7 @@ int write_pid_task_memory_stats(int prev, int curr, int dis, int disp_avg,
 
        if (dis) {
                PRINT_ID_HDR(prev_string, pidflag);
-               if (DISPLAY_MEM(actflag)) {
-                       printf("  minflt/s  majflt/s     VSZ    RSS   %%MEM");
-               }
-               if (DISPLAY_STACK(actflag)) {
-                       printf(" StkSize  StkRef");
-               }
-               printf("  Command\n");
+               printf("  minflt/s  majflt/s     VSZ    RSS   %%MEM  Command\n");
        }
        
        for (p = 0; p < pid_nr; p++) {
@@ -1598,14 +1600,8 @@ int write_pid_task_memory_stats(int prev, int curr, int dis, int disp_avg,
        
                /* This will be used to compute average */
                if (!disp_avg) {
-                       if (DISPLAY_MEM(actflag)) {
-                               pstc->total_vsz = pstp->total_vsz + pstc->vsz;
-                               pstc->total_rss = pstp->total_rss + pstc->rss;
-                       }
-                       if (DISPLAY_STACK(actflag)) {
-                               pstc->total_stack_size = pstp->total_stack_size + pstc->stack_size;
-                               pstc->total_stack_ref  = pstp->total_stack_ref  + pstc->stack_ref;
-                       }
+                       pstc->total_vsz = pstp->total_vsz + pstc->vsz;
+                       pstc->total_rss = pstp->total_rss + pstc->rss;
                        pstc->rt_asum_count = pstp->rt_asum_count + 1;
                }
 
@@ -1615,40 +1611,25 @@ int write_pid_task_memory_stats(int prev, int curr, int dis, int disp_avg,
 
                print_line_id(curr_string, pstc);
                
-               if (DISPLAY_MEM(actflag)) {
-                       printf(" %9.2f %9.2f ",
-                              S_VALUE(pstp->minflt, pstc->minflt, itv),
-                              S_VALUE(pstp->majflt, pstc->majflt, itv));
-
-                       if (disp_avg) {
-                               printf("%7.0f %6.0f %6.2f",
-                                      (double) pstc->total_vsz / pstc->rt_asum_count,
-                                      (double) pstc->total_rss / pstc->rt_asum_count,
-                                      tlmkb ?
-                                      SP_VALUE(0, pstc->total_rss / pstc->rt_asum_count, tlmkb)
-                                      : 0.0);
-                       }
-                       else {
-                               printf("%7lu %6lu %6.2f",
-                                      pstc->vsz,
-                                      pstc->rss,
-                                      tlmkb ? SP_VALUE(0, pstc->rss, tlmkb) : 0.0);
-                       }
+               printf(" %9.2f %9.2f ",
+                      S_VALUE(pstp->minflt, pstc->minflt, itv),
+                      S_VALUE(pstp->majflt, pstc->majflt, itv));
+
+               if (disp_avg) {
+                       printf("%7.0f %6.0f %6.2f",
+                              (double) pstc->total_vsz / pstc->rt_asum_count,
+                              (double) pstc->total_rss / pstc->rt_asum_count,
+                              tlmkb ?
+                              SP_VALUE(0, pstc->total_rss / pstc->rt_asum_count, tlmkb)
+                              : 0.0);
                }
-               
-               if (DISPLAY_STACK(actflag)) {
-                       if (disp_avg) {
-                               printf("%7.0f %7.0f",
-                                      (double) pstc->total_stack_size / pstc->rt_asum_count,
-                                      (double) pstc->total_stack_ref  / pstc->rt_asum_count);
-                       }
-                       else {
-                               printf("%7lu %7lu",
-                                      pstc->stack_size,
-                                      pstc->stack_ref);
-                       }
+               else {
+                       printf("%7lu %6lu %6.2f",
+                              pstc->vsz,
+                              pstc->rss,
+                              tlmkb ? SP_VALUE(0, pstc->rss, tlmkb) : 0.0);
                }
-
+               
                print_comm(pstc);
                again = 1;
        }
@@ -1725,6 +1706,79 @@ int write_pid_child_memory_stats(int prev, int curr, int dis, int disp_avg,
        return again;
 }
 
+/*
+ ***************************************************************************
+ * Display stack size statistics for tasks.
+ *
+ * IN:
+ * @prev       Index in array where stats used as reference are.
+ * @curr       Index in array for current sample statistics.
+ * @dis                TRUE if a header line must be printed.
+ * @disp_avg   TRUE if average stats are displayed.
+ * @prev_string        String displayed at the beginning of a header line. This is
+ *             the timestamp of the previous sample, or "Average" when
+ *             displaying average stats.
+ * @curr_string        String displayed at the beginning of current sample stats.
+ *             This is the timestamp of the current sample, or "Average"
+ *             when displaying average stats.
+ * @itv                Interval of time in jiffies.
+ *
+ * RETURNS:
+ * 0 if all the processes to display have terminated.
+ * <> 0 if there are still some processes left to display.
+ ***************************************************************************
+ */
+int write_pid_stack_stats(int prev, int curr, int dis, int disp_avg,
+                         char *prev_string, char *curr_string,
+                         unsigned long long itv)
+{
+       struct pid_stats *pstc, *pstp;
+       unsigned int p;
+       int rc, again = 0;
+
+       if (dis) {
+               PRINT_ID_HDR(prev_string, pidflag);
+               printf(" StkSize  StkRef  Command\n");
+       }
+       
+       for (p = 0; p < pid_nr; p++) {
+       
+               if ((rc = get_pid_to_display(prev, curr, p, P_A_STACK, P_NULL,
+                                            &pstc, &pstp)) == 0)
+                       /* PID no longer exists */
+                       continue;
+       
+               /* This will be used to compute average */
+               if (!disp_avg) {
+                       pstc->total_stack_size = pstp->total_stack_size + pstc->stack_size;
+                       pstc->total_stack_ref  = pstp->total_stack_ref  + pstc->stack_ref;
+                       pstc->sk_asum_count = pstp->sk_asum_count + 1;
+               }
+
+               if (rc < 0)
+                       /* PID should not be displayed */
+                       continue;
+
+               print_line_id(curr_string, pstc);
+               
+               if (disp_avg) {
+                       printf(" %7.0f %7.0f",
+                              (double) pstc->total_stack_size / pstc->sk_asum_count,
+                              (double) pstc->total_stack_ref  / pstc->sk_asum_count);
+               }
+               else {
+                       printf(" %7lu %7lu",
+                              pstc->stack_size,
+                              pstc->stack_ref);
+               }
+
+               print_comm(pstc);
+               again = 1;
+       }
+
+       return again;
+}
+
 /*
  ***************************************************************************
  * Display I/O statistics.
@@ -1974,8 +2028,8 @@ int write_stats_core(int prev, int curr, int dis, int disp_avg,
                        }
                }
 
-               /* Display memory and/or stack stats */
-               if (DISPLAY_MEM(actflag) || DISPLAY_STACK(actflag)) {
+               /* Display memory stats */
+               if (DISPLAY_MEM(actflag)) {
 
                        if (DISPLAY_TASK_STATS(tskflag)) {
                                again += write_pid_task_memory_stats(prev, curr, dis, disp_avg,
@@ -1987,6 +2041,12 @@ int write_stats_core(int prev, int curr, int dis, int disp_avg,
                        }
                }
 
+               /* Display stack stats */
+               if (DISPLAY_STACK(actflag)) {
+                       again += write_pid_stack_stats(prev, curr, dis, disp_avg,
+                                                      prev_string, curr_string, itv);
+               }
+
                /* Display I/O stats */
                if (DISPLAY_IO(actflag)) {
                        again += write_pid_io_stats(prev, curr, dis, prev_string,

diff --git a/pidstat.h b/pidstat.h
index a8a1ecf0cd635cd9dc5e99801b13cc93d282ac49..198696966c5a0f677cde13f3f7f58429314dba69 100644 (file)
--- a/pidstat.h
+++ b/pidstat.h
@@ -139,6 +139,7 @@ struct pid_stats {
        unsigned int       rc_asum_count                __attribute__ ((packed));
        unsigned int       uc_asum_count                __attribute__ ((packed));
        unsigned int       tf_asum_count                __attribute__ ((packed));
+       unsigned int       sk_asum_count                __attribute__ ((packed));
        unsigned int       processor                    __attribute__ ((packed));
        unsigned int       flags                        __attribute__ ((packed));
        unsigned int       uid                          __attribute__ ((packed));