sar: PSI: Read PSI statistics

Read statistics from /proc/pressure/* files.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/rd_stats.c b/rd_stats.c
index e17377ba0ba583b4aa833a9e48618539ca087379..8879bc634baa4e5efbcd1ddc4917b89861ee4030 100644 (file)
--- a/rd_stats.c
+++ b/rd_stats.c
@@ -41,6 +41,14 @@
 #define _(string) (string)
 #endif
 
+/* Generic PSI structure */
+struct stats_psi {
+       unsigned long long total;
+       unsigned long      avg10;
+       unsigned long      avg60;
+       unsigned long      avg300;
+};
+
 /*
  ***************************************************************************
  * Read CPU statistics.
@@ -2724,5 +2732,165 @@ int read_softnet(struct stats_softnet *st_softnet, __nr_t nr_alloc,
        return 1;
 }
 
+/*
+ ***************************************************************************
+ * Read pressure-stall information from a file located in /proc/pressure
+ * directory.
+ *
+ * IN:
+ * @st_psi     Structure where stats will be saved.
+ * @filename   File located in /proc/pressure directory to read.
+ * @token      "some" or "full". Indicate which line shall be read in file.
+ *
+ * OUT:
+ * @st_psi     Structure with statistics.
+ *
+ * RETURNS:
+ * 1 on success, 0 otherwise.
+ ***************************************************************************
+ */
+int read_psi_stub(struct stats_psi *st_psi, char *filename, char *token)
+{
+       FILE *fp;
+       char line[8192];
+       unsigned long psi_tmp[3];
+       int rc = 0, len;
+
+       if ((fp = fopen(filename, "r")) == NULL)
+               return 0;
+
+       len = strlen(token);
+       while (fgets(line, sizeof(line), fp) != NULL) {
+
+               if (!strncmp(line, token, len)) {
+                       /* Read stats */
+                       rc = sscanf(line + len + 1, "avg10=%lu.%lu avg60=%lu.%lu avg300=%lu.%lu total=%llu",
+                                   &psi_tmp[0], &st_psi->avg10,
+                                   &psi_tmp[1], &st_psi->avg60,
+                                   &psi_tmp[2], &st_psi->avg300,
+                                   &st_psi->total);
+               }
+       }
+
+       fclose(fp);
+
+       if (rc < 7)
+               return 0;
+
+       st_psi->avg10  += psi_tmp[0] * 100;
+       st_psi->avg60  += psi_tmp[1] * 100;
+       st_psi->avg300 += psi_tmp[2] * 100;
+
+       return 1;
+}
+
+/*
+ ***************************************************************************
+ * Read pressure-stall CPU information.
+ *
+ * IN:
+ * @st_psi_cpu Structure where stats will be saved.
+ *
+ * OUT:
+ * @st_psi_cpu Structure with statistics.
+ *
+ * RETURNS:
+ * 1 on success, 0 otherwise.
+ ***************************************************************************
+ */
+__nr_t read_psicpu(struct stats_psi_cpu *st_psi_cpu)
+{
+       struct stats_psi st_psi;
+
+       /* Read CPU stats */
+       if (!read_psi_stub(&st_psi, PSI_CPU, "some"))
+               return 0;
+
+       st_psi_cpu->some_acpu_10   = st_psi.avg10;
+       st_psi_cpu->some_acpu_60   = st_psi.avg60;
+       st_psi_cpu->some_acpu_300  = st_psi.avg300;
+       st_psi_cpu->some_cpu_total = st_psi.total;
+
+       return 1;
+}
+
+/*
+ ***************************************************************************
+ * Read pressure-stall I/O information.
+ *
+ * IN:
+ * @st_psi_io  Structure where stats will be saved.
+ *
+ * OUT:
+ * @st_psi_io  Structure with statistics.
+ *
+ * RETURNS:
+ * 1 on success, 0 otherwise.
+ ***************************************************************************
+ */
+__nr_t read_psiio(struct stats_psi_io *st_psi_io)
+{
+       struct stats_psi st_psi;
+
+       /* Read I/O "some" stats */
+       if (!read_psi_stub(&st_psi, PSI_IO, "some"))
+               return 0;
+
+       st_psi_io->some_aio_10   = st_psi.avg10;
+       st_psi_io->some_aio_60   = st_psi.avg60;
+       st_psi_io->some_aio_300  = st_psi.avg300;
+       st_psi_io->some_io_total = st_psi.total;
+
+       /* Read I/O "full" stats */
+       if (!read_psi_stub(&st_psi, PSI_IO, "full"))
+               return 0;
+
+       st_psi_io->full_aio_10   = st_psi.avg10;
+       st_psi_io->full_aio_60   = st_psi.avg60;
+       st_psi_io->full_aio_300  = st_psi.avg300;
+       st_psi_io->full_io_total = st_psi.total;
+
+       return 1;
+}
+
+/*
+ ***************************************************************************
+ * Read pressure-stall memory information.
+ *
+ * IN:
+ * @st_psi_mem Structure where stats will be saved.
+ *
+ * OUT:
+ * @st_psi_mem Structure with statistics.
+ *
+ * RETURNS:
+ * 1 on success, 0 otherwise.
+ ***************************************************************************
+ */
+__nr_t read_psimem(struct stats_psi_mem *st_psi_mem)
+{
+       struct stats_psi st_psi;
+
+       /* Read memory "some" stats */
+       if (!read_psi_stub(&st_psi, PSI_MEM, "some"))
+               return 0;
+
+       st_psi_mem->some_amem_10   = st_psi.avg10;
+       st_psi_mem->some_amem_60   = st_psi.avg60;
+       st_psi_mem->some_amem_300  = st_psi.avg300;
+       st_psi_mem->some_mem_total = st_psi.total;
+
+       /* Read memory "full" stats */
+       if (!read_psi_stub(&st_psi, PSI_MEM, "full"))
+               return 0;
+
+       st_psi_mem->full_amem_10   = st_psi.avg10;
+       st_psi_mem->full_amem_60   = st_psi.avg60;
+       st_psi_mem->full_amem_300  = st_psi.avg300;
+       st_psi_mem->full_mem_total = st_psi.total;
+
+       return 1;
+}
+
 /*------------------ END: FUNCTIONS USED BY SADC ONLY ---------------------*/
 #endif /* SOURCE_SADC */

diff --git a/rd_stats.h b/rd_stats.h
index c9e72b3cf4e7514ce3b19f74145c82bb94f05a5e..13c92cae1eac657afe974c2df1671fc2f222df2b 100644 (file)
--- a/rd_stats.h
+++ b/rd_stats.h
@@ -844,6 +844,13 @@ __nr_t read_fchost
        (struct stats_fchost *, __nr_t);
 int read_softnet
        (struct stats_softnet *, __nr_t, unsigned char []);
+__nr_t read_psicpu
+       (struct stats_psi_cpu *);
+__nr_t read_psiio
+       (struct stats_psi_io *);
+__nr_t read_psimem
+       (struct stats_psi_mem *);
+
 #endif /* SOURCE_SADC */
 
 #endif /* _RD_STATS_H */

diff --git a/sa_wrap.c b/sa_wrap.c
index 966fd2c3f93f4162f322d5062090730a344e3103..df12b971b1114630ec974401e00852b041d84a75 100644 (file)
--- a/sa_wrap.c
+++ b/sa_wrap.c
@@ -1177,7 +1177,7 @@ __read_funct_t wrap_read_psicpu(struct activity *a)
                = (struct stats_psi_cpu *) a->_buf0;
 
        /* Read pressure-stall CPU stats */
-//     read_psicpu(st_psicpu);
+       read_psicpu(st_psicpu);
 
        return;
 }
@@ -1199,7 +1199,7 @@ __read_funct_t wrap_read_psiio(struct activity *a)
                = (struct stats_psi_io *) a->_buf0;
 
        /* Read pressure-stall I/O stats */
-//     read_psiio(st_psiio);
+       read_psiio(st_psiio);
 
        return;
 }
@@ -1221,7 +1221,7 @@ __read_funct_t wrap_read_psimem(struct activity *a)
                = (struct stats_psi_mem *) a->_buf0;
 
        /* Read pressure-stall memory stats */
-//     read_psimem(st_psimem);
+       read_psimem(st_psimem);
 
        return;
 }