X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=fde0dcde9abd5112c48633a6dcd588ef8bb0f69b;hb=ba2ee9aec4c0454eed8f29b4c6ce96c6fc372346;hp=0a90899215b8f6b827ccb147a9b648f2861474f9;hpb=d48a9456e42af4ab5881ab055c95ceab71819bc1;p=collectd.git

diff --git a/src/disk.c b/src/disk.c
index 0a908992..fde0dcde 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/disk.c
- * Copyright (C) 2005-2008  Florian octo Forster
+ * Copyright (C) 2005-2010  Florian octo Forster
  * Copyright (C) 2009       Manuel Sanmartin
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -85,19 +85,19 @@ typedef struct diskstats
 	/* This overflows in roughly 1361 years */
 	unsigned int poll_count;
 
-	counter_t read_sectors;
-	counter_t write_sectors;
+	derive_t read_sectors;
+	derive_t write_sectors;
 
-	counter_t read_bytes;
-	counter_t write_bytes;
+	derive_t read_bytes;
+	derive_t write_bytes;
 
-	counter_t read_ops;
-	counter_t write_ops;
-	counter_t read_time;
-	counter_t write_time;
+	derive_t read_ops;
+	derive_t write_ops;
+	derive_t read_time;
+	derive_t write_time;
 
-	counter_t avg_read_time;
-	counter_t avg_write_time;
+	derive_t avg_read_time;
+	derive_t avg_write_time;
 
 	struct diskstats *next;
 } diskstats_t;
@@ -212,7 +212,7 @@ static int disk_init (void)
 
 static void disk_submit (const char *plugin_instance,
 		const char *type,
-		counter_t read, counter_t write)
+		derive_t read, derive_t write)
 {
 	value_t values[2];
 	value_list_t vl = VALUE_LIST_INIT;
@@ -221,8 +221,8 @@ static void disk_submit (const char *plugin_instance,
 	if (ignorelist_match (ignorelist, plugin_instance) != 0)
 	  return;
 
-	values[0].counter = read;
-	values[1].counter = write;
+	values[0].derive = read;
+	values[1].derive = write;
 
 	vl.values = values;
 	vl.values_len = 2;
@@ -426,18 +426,17 @@ static int disk_read (void)
 	int numfields;
 	int fieldshift = 0;
 
-	int major = 0;
 	int minor = 0;
 
-	counter_t read_sectors  = 0;
-	counter_t write_sectors = 0;
+	derive_t read_sectors  = 0;
+	derive_t write_sectors = 0;
 
-	counter_t read_ops      = 0;
-	counter_t read_merged   = 0;
-	counter_t read_time     = 0;
-	counter_t write_ops     = 0;
-	counter_t write_merged  = 0;
-	counter_t write_time    = 0;
+	derive_t read_ops      = 0;
+	derive_t read_merged   = 0;
+	derive_t read_time     = 0;
+	derive_t write_ops     = 0;
+	derive_t write_merged  = 0;
+	derive_t write_time    = 0;
 	int is_disk = 0;
 
 	diskstats_t *ds, *pre_ds;
@@ -464,7 +463,6 @@ static int disk_read (void)
 		if ((numfields != (14 + fieldshift)) && (numfields != 7))
 			continue;
 
-		major = atoll (fields[0]);
 		minor = atoll (fields[1]);
 
 		disk_name = fields[2 + fieldshift];
@@ -523,8 +521,8 @@ static int disk_read (void)
 		}
 
 		{
-			counter_t diff_read_sectors;
-			counter_t diff_write_sectors;
+			derive_t diff_read_sectors;
+			derive_t diff_write_sectors;
 
 		/* If the counter wraps around, it's only 32 bits.. */
 			if (read_sectors < ds->read_sectors)
@@ -547,18 +545,18 @@ static int disk_read (void)
 		/* Calculate the average time an io-op needs to complete */
 		if (is_disk)
 		{
-			counter_t diff_read_ops;
-			counter_t diff_write_ops;
-			counter_t diff_read_time;
-			counter_t diff_write_time;
+			derive_t diff_read_ops;
+			derive_t diff_write_ops;
+			derive_t diff_read_time;
+			derive_t diff_write_time;
 
 			if (read_ops < ds->read_ops)
 				diff_read_ops = 1 + read_ops
 					+ (UINT_MAX - ds->read_ops);
 			else
 				diff_read_ops = read_ops - ds->read_ops;
-			DEBUG ("disk plugin: disk_name = %s; read_ops = %llu; "
-					"ds->read_ops = %llu; diff_read_ops = %llu;",
+			DEBUG ("disk plugin: disk_name = %s; read_ops = %"PRIi64"; "
+					"ds->read_ops = %"PRIi64"; diff_read_ops = %"PRIi64";",
 					disk_name,
 					read_ops, ds->read_ops, diff_read_ops);
 
@@ -700,12 +698,12 @@ static int disk_read (void)
 /* #endif defined(HAVE_LIBSTATGRAB) */
 
 #elif defined(HAVE_PERFSTAT)
-	counter_t read_sectors;
-	counter_t write_sectors;
-	counter_t read_time;
-	counter_t write_time;
-	counter_t read_ops;
-	counter_t write_ops;
+	derive_t read_sectors;
+	derive_t write_sectors;
+	derive_t read_time;
+	derive_t write_time;
+	derive_t read_ops;
+	derive_t write_ops;
 	perfstat_id_t firstpath;
 	int rnumdisk;
 	int i;