Update functons used to count number of FC hosts

Update/improve functions used to count number of FC hosts: 1) Move code used to count hosts from sa_wrap.c to its normal location (count.c). 2) Preallocate FC host structures to take into account a possibly dynamically registerd host. No structures are allocated only if /sys/class/fc_host directory is not found. Signed-off-by: Sebastien GODARD <[email protected]>
sysstat · Apr 12, 2015 · a187f65 · a187f65
1 parent a3797b1
commit a187f65
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 13 deletions.
diff --git a/count.c b/count.c
@@ -495,5 +495,38 @@ int get_filesystem_nr(void)
  return fs;
 }
 
+/*
+ ***************************************************************************
+ * Find number of fibre channel hosts in /sys/class/fc_host/.
+ *
+ * RETURNS:
+ * Number of FC hosts.
+ * Return -1 if directory doesn't exist in sysfs.
+ ***************************************************************************
+ */
+int get_fchost_nr(void)
+{
+ DIR *dir;
+ struct dirent *drd;
+ int fc = 0;
+
+ if ((dir = opendir(SYSFS_FCHOST)) == NULL) {
+ /* Directory non-existent */
+ return -1;
+ }
+
+ while ((drd = readdir(dir)) != NULL) {
+
+ if (!strncmp(drd->d_name, "host", 4)) {
+ fc++;
+ }
+ }
+
+ /* Close directory */
+ closedir(dir);
+
+ return fc;
+}
+
 /*------------------ END: FUNCTIONS USED BY SADC ONLY ---------------------*/
 #endif /* SOURCE_SADC */
diff --git a/count.h b/count.h
@@ -35,5 +35,7 @@ extern int
  get_usb_nr(void);
 extern int
  get_filesystem_nr(void);
+extern int
+ get_fchost_nr(void);
 
 #endif /* _COUNT_H */
diff --git a/json_stats.c b/json_stats.c
@@ -2184,6 +2184,10 @@ __print_funct_t json_print_fchost_stats(struct activity *a, int curr, int tab,
  sfcc = (struct stats_fchost *) ((char *) a->buf[curr] + i * a->msize);
  sfcp = (struct stats_fchost *) ((char *) a->buf[!curr] + i * a->msize);
 
+ if (!sfcc->fchost_name[0])
+ /* We are at the end of the list */
+ break;
+
  if (sep)
  printf(",\n");
 

diff --git a/pr_stats.c b/pr_stats.c
@@ -2610,6 +2610,10 @@ __print_funct_t print_fchost_stats(struct activity *a, int prev, int curr,
  sfcc = (struct stats_fchost *) ((char *) a->buf[curr] + i * a->msize);
  sfcp = (struct stats_fchost *) ((char *) a->buf[prev] + i * a->msize);
 
+ if (!sfcc->fchost_name[0])
+ /* We are at the end of the list */
+ break;
+
  printf("%-11s %9.2f %9.2f %9.2f %9.2f %s\n", timestamp[curr],
  S_VALUE(sfcp->f_rxframes, sfcc->f_rxframes, itv),
  S_VALUE(sfcp->f_txframes, sfcc->f_txframes, itv),

diff --git a/prealloc.in b/prealloc.in
@@ -13,5 +13,6 @@
 #define NR_FREQ_PREALLOC (0 * @PREALLOC_FACTOR@)
 #define NR_USB_PREALLOC (5 * @PREALLOC_FACTOR@)
 #define NR_FILESYSTEM_PREALLOC (3 * @PREALLOC_FACTOR@)
+#define NR_FCHOST_PREALLOC (1 * @PREALLOC_FACTOR@)
 
 #endif /* _PREALLOC_H */
diff --git a/rndr_stats.c b/rndr_stats.c
@@ -2940,6 +2940,10 @@ __print_funct_t render_fchost_stats(struct activity *a, int isdb, char *pre,
  sfcc = (struct stats_fchost *) ((char *) a->buf[curr] + i * a->msize);
  sfcp = (struct stats_fchost *) ((char *) a->buf[!curr] + i * a->msize);
 
+ if (!sfcc->fchost_name[0])
+ /* We are at the end of the list */
+ break;
+
  render(isdb, pre, PT_NOFLAG ,
  "%s\tfch_rxf/s",
  "%s",

diff --git a/sa_wrap.c b/sa_wrap.c
@@ -1129,7 +1129,7 @@ __nr_t wrap_get_filesystem_nr(struct activity *a)
 
 /*
  ***************************************************************************
- * Get number of FC hosts
+ * Get number of FC hosts.
  *
  * IN:
  * @a Activity structure.
@@ -1140,19 +1140,11 @@ __nr_t wrap_get_filesystem_nr(struct activity *a)
  */
 __nr_t wrap_get_fchost_nr(struct activity *a)
 {
- DIR *dir;
- struct dirent *drd;
  __nr_t n = 0;
 
- if ((dir = opendir(SYSFS_FCHOST)) == NULL) {
- return 0;
- }
-
- while ((drd = readdir(dir)) != NULL)
- if (strncmp(drd->d_name,"host",4)==0)
- n++;
-
- closedir(dir);
+ if ((n = get_fchost_nr()) >= 0)
+ /* Return a positive number even if no FC hosts have been found */
+ return n + NR_FCHOST_PREALLOC;
 
- return n;
+ return 0;
 }
diff --git a/xml_stats.c b/xml_stats.c
@@ -2084,6 +2084,10 @@ __print_funct_t xml_print_fchost_stats(struct activity *a, int curr, int tab,
  sfcc = (struct stats_fchost *) ((char *) a->buf[curr] + i * a->msize);
  sfcp = (struct stats_fchost *) ((char *) a->buf[!curr] + i * a->msize);
 
+ if (!sfcc->fchost_name[0])
+ /* We are at the end of the list */
+ break;
+
  xprintf(tab, "<fchost name=\"%s\" "
  "rxframes=\"%.2f\" "
  "txframes=\"%.2f\" "