X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fzfs_arc.c;h=41a89b16aef5348bb26a6d24a43fad50f316d5b7;hb=40aabf444e124f40603021821e98bcc40c4aaa0e;hp=b784ee3a3fc1374a66e03f12b432c625ae48dce1;hpb=4e5c84e8251b25b11b5df7ef3b66259436bdea69;p=collectd.git

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index b784ee3a..41a89b16 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -186,7 +186,7 @@ static int za_read (void)
 		return (-1);
 	}
 
-	len = read_file_contents (ZOL_ARCSTATS_FILE, file_contents, sizeof(file_contents));
+	len = read_file_contents (ZOL_ARCSTATS_FILE, file_contents, sizeof(file_contents) - 1);
 	if (len > 1)
 	{
 
@@ -208,6 +208,11 @@ static int za_read (void)
 		{
 			llentry_t *e;
 			llvalues = malloc(sizeof(long long int) * i);
+			if (llvalues == NULL)
+			{
+				ERROR ("zfs_arc plugin: `malloc' failed.");
+				return (-1);
+			}
 			int j = 0;
 
 			pnl = file_contents;
@@ -251,7 +256,17 @@ static int za_read (void)
 
 	/* Sizes */
 	za_read_gauge (ksp, "size",    "cache_size", "arc");
-	za_read_gauge (ksp, "l2_size", "cache_size", "L2");
+	za_read_gauge (ksp, "c",    "cache_size", "c");
+	za_read_gauge (ksp, "c_min",    "cache_size", "c_min");
+	za_read_gauge (ksp, "c_max",    "cache_size", "c_max");
+
+	/* The "l2_size" value has disappeared from Solaris some time in
+	 * early 2013, and has only reappeared recently in Solaris 11.2.
+	 * Stop trying if we ever fail to read it, so we don't spam the log.
+	 */
+	static int l2_size_avail = 1;
+	if (l2_size_avail && za_read_gauge (ksp, "l2_size", "cache_size", "L2") != 0)
+		l2_size_avail = 0;
 
 	/* Operations */
 	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");