Fix small logic error in diskio.
[monky] / src / diskio.c
index 66cde04..0ca8502 100644 (file)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
@@ -8,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  * (see AUTHORS)
  * All rights reserved.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *  $Id$
  */
 
+#include "config.h"
+#include "conky.h"     /* text_buffer_size */
+#include "core.h"
+#include "logging.h"
+#include "diskio.h"
+#include "common.h"
+#include "specials.h"
+#include "text_object.h"
+#include <stdlib.h>
 #include <limits.h>
-#include "conky.h"
+#include <sys/stat.h>
 
-static struct diskio_stat diskio_stats_[MAX_DISKIO_STATS];
-struct diskio_stat *diskio_stats = diskio_stats_;
+/* this is the root of all per disk stats,
+ * also containing the totals. */
+struct diskio_stat stats = {
+       .next = NULL,
+       .sample = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+       .sample_read = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+       .sample_write = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+       .current = 0,
+       .current_read = 0,
+       .current_write = 0,
+       .last = UINT_MAX,
+       .last_read = UINT_MAX,
+       .last_write = UINT_MAX,
+};
 
 void clear_diskio_stats(void)
 {
-       unsigned i;
-       for(i = 0; i < MAX_DISKIO_STATS; i++) {
-               if (diskio_stats[i].dev) {
-                       free(diskio_stats[i].dev);
-                       diskio_stats[i].dev = 0;
-               }
+       struct diskio_stat *cur;
+       while (stats.next) {
+               cur = stats.next;
+               stats.next = stats.next->next;
+               if (cur->dev)
+                       free(cur->dev);
+               free(cur);
        }
 }
 
 struct diskio_stat *prepare_diskio_stat(const char *s)
 {
-       struct diskio_stat *new = 0;
-       unsigned i;
-       /* lookup existing or get new */
-       for (i = 0; i < MAX_DISKIO_STATS; i++) {
-               if (diskio_stats[i].dev) {
-                       if (strcmp(diskio_stats[i].dev, s) == 0) {
-                               return &diskio_stats[i];
-                       }
-               } else {
-                       new = &diskio_stats[i];
-                       break;
+       struct stat sb;
+       char stat_name[text_buffer_size], device_name[text_buffer_size];
+       struct diskio_stat *cur = &stats;
+
+       if (!s)
+               return &stats;
+
+#if defined(__FreeBSD__)
+       if (strncmp(s, "/dev/", 5) == 0) {
+               // supplied a /dev/device arg, so cut off the /dev part
+               strncpy(device_name, s + 5, text_buffer_size);
+       } else
+#endif
+       strncpy(device_name, s, text_buffer_size);
+
+       snprintf(stat_name, text_buffer_size, "/dev/%s", device_name);
+
+       if (stat(stat_name, &sb)) {
+               NORM_ERR("diskio device '%s' does not exist", s);
+       }
+
+       /* lookup existing */
+       while (cur->next) {
+               cur = cur->next;
+               if (!strcmp(cur->dev, device_name)) {
+                       return cur;
                }
        }
-       /* new dev */
-       if (!new) {
-               ERR("too many diskio stats");
-               return 0;
+
+       /* no existing found, make a new one */
+       cur->next = calloc(1, sizeof(struct diskio_stat));
+       cur = cur->next;
+       cur->dev = strndup(device_name, text_buffer_size);
+       cur->last = UINT_MAX;
+       cur->last_read = UINT_MAX;
+       cur->last_write = UINT_MAX;
+
+       return cur;
+}
+
+void parse_diskio_arg(struct text_object *obj, const char *arg)
+{
+       obj->data.opaque = prepare_diskio_stat(arg);
+}
+
+/* dir indicates the direction:
+ * -1: read
+ *  0: read + write
+ *  1: write
+ */
+static void print_diskio_dir(struct text_object *obj, int dir, char *p, int p_max_size)
+{
+       struct diskio_stat *diskio = obj->data.opaque;
+       double val;
+
+       if (!diskio)
+               return;
+
+       if (dir < 0)
+               val = diskio->current_read;
+       else if (dir == 0)
+               val = diskio->current;
+       else
+               val = diskio->current_write;
+
+       /* TODO: move this correction from kB to kB/s elsewhere
+        * (or get rid of it??) */
+       human_readable((val / update_interval) * 1024LL, p, p_max_size);
+}
+
+void print_diskio(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskio_dir(obj, 0, p, p_max_size);
+}
+
+void print_diskio_read(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskio_dir(obj, -1, p, p_max_size);
+}
+
+void print_diskio_write(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskio_dir(obj, 1, p, p_max_size);
+}
+
+#ifdef X11
+void parse_diskiograph_arg(struct text_object *obj, const char *arg)
+{
+       char *buf = 0;
+       buf = scan_graph(obj, arg, 0);
+
+       obj->data.opaque = prepare_diskio_stat(dev_name(buf));
+       if (buf)
+               free(buf);
+}
+
+static void print_diskiograph_dir(struct text_object *obj, int dir, char *p, int p_max_size)
+{
+       struct diskio_stat *diskio = obj->data.opaque;
+       double val;
+
+       if (!diskio)
+               return;
+
+       if (!p_max_size)
+               return;
+
+       if (dir < 0)
+               val = diskio->current_read;
+       else if (dir == 0)
+               val = diskio->current;
+       else
+               val = diskio->current_write;
+
+       new_graph(obj, p, p_max_size, val);
+}
+
+void print_diskiograph(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskiograph_dir(obj, 0, p, p_max_size);
+}
+
+void print_diskiograph_read(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskiograph_dir(obj, -1, p, p_max_size);
+}
+
+void print_diskiograph_write(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskiograph_dir(obj, 1, p, p_max_size);
+}
+#endif /* X11 */
+
+void update_diskio_values(struct diskio_stat *ds,
+               unsigned int reads, unsigned int writes)
+{
+       int i;
+       double sum=0, sum_r=0, sum_w=0;
+
+       if (reads < ds->last_read || writes < ds->last_write) {
+               /* counter overflow or reset - rebase to sane values */
+               ds->last = reads+writes;
+               ds->last_read = reads;
+               ds->last_write = writes;
+       }
+       /* since the values in /proc/diskstats are absolute, we have to substract
+        * our last reading. The numbers stand for "sectors read", and we therefore
+        * have to divide by two to get KB */
+       ds->sample_read[0] = (reads - ds->last_read) / 2;
+       ds->sample_write[0] = (writes - ds->last_write) / 2;
+       ds->sample[0] = ds->sample_read[0] + ds->sample_write[0];
+
+       /* compute averages */
+       for (i = 0; i < (signed) info.diskio_avg_samples; i++) {
+               sum += ds->sample[i];
+               sum_r += ds->sample_read[i];
+               sum_w += ds->sample_write[i];
        }
-       new->dev = strdup(s);
-       new->current = 0;
-       new->current_read = 0;
-       new ->current_write = 0;
-       new->last = UINT_MAX;
-       new->last_read = UINT_MAX;
-       new->last_write = UINT_MAX;
-       return new;
+       ds->current = sum / (double) info.diskio_avg_samples;
+       ds->current_read = sum_r / (double) info.diskio_avg_samples;
+       ds->current_write = sum_w / (double) info.diskio_avg_samples;
+
+       /* shift sample history */
+       for (i = info.diskio_avg_samples-1; i > 0; i--) {
+               ds->sample[i] = ds->sample[i-1];
+               ds->sample_read[i] = ds->sample_read[i-1];
+               ds->sample_write[i] = ds->sample_write[i-1];
+       }
+
+       /* save last */
+       ds->last_read = reads;
+       ds->last_write = writes;
+       ds->last = ds->last_read + ds->last_write;
 }
+