Merge branch 'collectd-5.8'

[collectd.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index c7d56c7..26bd969 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -26,107 +26,100 @@
 #include "plugin.h"
 
 #if !HAVE_LIBKSTAT
-# error "No applicable input method."
+#error "No applicable input method."
+#endif
+
+#if HAVE_KSTAT_H
+#include <kstat.h>
 #endif
 
 #define MAX_NUMTAPE 256
 extern kstat_ctl_t *kc;
 static kstat_t *ksp[MAX_NUMTAPE];
-static int numtape = 0;
+static int numtape;
 
-static int tape_init (void)
-{
-       kstat_t *ksp_chain;
+static int tape_init(void) {
+  kstat_t *ksp_chain;
 
-       numtape = 0;
+  numtape = 0;
 
-       if (kc == NULL)
-               return (-1);
+  if (kc == NULL)
+    return -1;
 
-       for (numtape = 0, ksp_chain = kc->kc_chain;
-                       (numtape < MAX_NUMTAPE) && (ksp_chain != NULL);
-                       ksp_chain = ksp_chain->ks_next)
-       {
-               if (strncmp (ksp_chain->ks_class, "tape", 4) )
-                       continue;
-               if (ksp_chain->ks_type != KSTAT_TYPE_IO)
-                       continue;
-               ksp[numtape++] = ksp_chain;
-       }
+  for (numtape = 0, ksp_chain = kc->kc_chain;
+       (numtape < MAX_NUMTAPE) && (ksp_chain != NULL);
+       ksp_chain = ksp_chain->ks_next) {
+    if (strncmp(ksp_chain->ks_class, "tape", 4))
+      continue;
+    if (ksp_chain->ks_type != KSTAT_TYPE_IO)
+      continue;
+    ksp[numtape++] = ksp_chain;
+  }
 
-       return (0);
+  return 0;
 } /* int tape_init */
 
-static void tape_submit (const char *plugin_instance,
-               const char *type,
-               derive_t read, derive_t write)
-{
-       value_list_t vl = VALUE_LIST_INIT;
-       value_t values[] = {
-               { .derive = read },
-               { .derive = write },
-       };
-
-       vl.values = values;
-       vl.values_len = STATIC_ARRAY_SIZE (values);
-       sstrncpy (vl.plugin, "tape", sizeof (vl.plugin));
-       sstrncpy (vl.plugin_instance, plugin_instance,
-                       sizeof (vl.plugin_instance));
-       sstrncpy (vl.type, type, sizeof (vl.type));
-
-       plugin_dispatch_values (&vl);
+static void tape_submit(const char *plugin_instance, const char *type,
+                        derive_t read, derive_t write) {
+  value_list_t vl = VALUE_LIST_INIT;
+  value_t values[] = {
+      {.derive = read}, {.derive = write},
+  };
+
+  vl.values = values;
+  vl.values_len = STATIC_ARRAY_SIZE(values);
+  sstrncpy(vl.plugin, "tape", sizeof(vl.plugin));
+  sstrncpy(vl.plugin_instance, plugin_instance, sizeof(vl.plugin_instance));
+  sstrncpy(vl.type, type, sizeof(vl.type));
+
+  plugin_dispatch_values(&vl);
 } /* void tape_submit */
 
-static int tape_read (void)
-{
+static int tape_read(void) {
 
 #if HAVE_KSTAT_IO_T_WRITES && HAVE_KSTAT_IO_T_NWRITES && HAVE_KSTAT_IO_T_WTIME
-# define KIO_ROCTETS reads
-# define KIO_WOCTETS writes
-# define KIO_ROPS    nreads
-# define KIO_WOPS    nwrites
-# define KIO_RTIME   rtime
-# define KIO_WTIME   wtime
-#elif HAVE_KSTAT_IO_T_NWRITTEN && HAVE_KSTAT_IO_T_WRITES && HAVE_KSTAT_IO_T_WTIME
-# define KIO_ROCTETS nread
-# define KIO_WOCTETS nwritten
-# define KIO_ROPS    reads
-# define KIO_WOPS    writes
-# define KIO_RTIME   rtime
-# define KIO_WTIME   wtime
+#define KIO_ROCTETS reads
+#define KIO_WOCTETS writes
+#define KIO_ROPS nreads
+#define KIO_WOPS nwrites
+#define KIO_RTIME rtime
+#define KIO_WTIME wtime
+#elif HAVE_KSTAT_IO_T_NWRITTEN && HAVE_KSTAT_IO_T_WRITES &&                    \
+    HAVE_KSTAT_IO_T_WTIME
+#define KIO_ROCTETS nread
+#define KIO_WOCTETS nwritten
+#define KIO_ROPS reads
+#define KIO_WOPS writes
+#define KIO_RTIME rtime
+#define KIO_WTIME wtime
 #else
-# error "kstat_io_t does not have the required members"
+#error "kstat_io_t does not have the required members"
 #endif
-       static kstat_io_t kio;
-
-       if (kc == NULL)
-               return (-1);
-
-       if (numtape <= 0)
-               return (-1);
-
-       for (int i = 0; i < numtape; i++)
-       {
-               if (kstat_read (kc, ksp[i], &kio) == -1)
-                       continue;
-
-               if (strncmp (ksp[i]->ks_class, "tape", 4) == 0)
-               {
-                       tape_submit (ksp[i]->ks_name, "tape_octets",
-                                       kio.KIO_ROCTETS, kio.KIO_WOCTETS);
-                       tape_submit (ksp[i]->ks_name, "tape_ops",
-                                       kio.KIO_ROPS, kio.KIO_WOPS);
-                       /* FIXME: Convert this to microseconds if necessary */
-                       tape_submit (ksp[i]->ks_name, "tape_time",
-                                       kio.KIO_RTIME, kio.KIO_WTIME);
-               }
-       }
-
-       return (0);
+  static kstat_io_t kio;
+
+  if (kc == NULL)
+    return -1;
+
+  if (numtape <= 0)
+    return -1;
+
+  for (int i = 0; i < numtape; i++) {
+    if (kstat_read(kc, ksp[i], &kio) == -1)
+      continue;
+
+    if (strncmp(ksp[i]->ks_class, "tape", 4) == 0) {
+      tape_submit(ksp[i]->ks_name, "tape_octets", kio.KIO_ROCTETS,
+                  kio.KIO_WOCTETS);
+      tape_submit(ksp[i]->ks_name, "tape_ops", kio.KIO_ROPS, kio.KIO_WOPS);
+      /* FIXME: Convert this to microseconds if necessary */
+      tape_submit(ksp[i]->ks_name, "tape_time", kio.KIO_RTIME, kio.KIO_WTIME);
+    }
+  }
+
+  return 0;
 }
 
-void module_register (void)
-{
-       plugin_register_init ("tape", tape_init);
-       plugin_register_read ("tape", tape_read);
+void module_register(void) {
+  plugin_register_init("tape", tape_init);
+  plugin_register_read("tape", tape_read);
 }