Modified arcstat.py to run on linux

* Modified kstat_update() to read arcstats from proc.
* Fix shebang.
* Added Makefile.am entries for arcstat.py

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1506

diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 1a51ddcbc808747ee9b83f8ab26962fdade1fd0e..bad1af63eab9b9d99ff1de6e652e136106be4d7c 100644 (file)
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS  = zfs zpool zdb zhack zinject zstreamdump ztest zpios
-SUBDIRS += mount_zfs fsck_zfs zvol_id vdev_id
+SUBDIRS += mount_zfs fsck_zfs zvol_id vdev_id arcstat

diff --git a/cmd/arcstat/Makefile.am b/cmd/arcstat/Makefile.am
new file mode 100644 (file)
index 0000000..802b8e1
--- /dev/null
+++ b/cmd/arcstat/Makefile.am
@@ -0,0 +1,2 @@
+bin_SCRIPTS = arcstat.py
+EXTRA_DIST = $(bin_SCRIPTS)

diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py
index fcfdbb8323c7138e08fdbc8398edc8e33c8db402..e01dd8b4c866482e1cc33930564185b2eb5aa9fc 100755 (executable)
--- a/cmd/arcstat/arcstat.py
+++ b/cmd/arcstat/arcstat.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 #
 # Print out ZFS ARC Statistics exported via kstat(1)
 # For a definition of fields, or usage, use arctstat.pl -v
@@ -51,7 +51,6 @@ import re
 import copy
 
 from decimal import Decimal
-from subprocess import Popen, PIPE
 from signal import signal, SIGINT
 
 cols = {
@@ -149,33 +148,20 @@ def usage():
 def kstat_update():
     global kstat
 
-    p = Popen("/sbin/sysctl -q 'kstat.zfs.misc.arcstats'", stdin=PIPE,
-        stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
-    p.wait()
-
-    k = p.communicate()[0].split('\n')
-    if p.returncode != 0:
-        sys.exit(1)
+    k = [line.strip() for line in open('/proc/spl/kstat/zfs/arcstats')]
 
     if not k:
         sys.exit(1)
 
+    del k[0:2]
     kstat = {}
 
     for s in k:
         if not s:
             continue
 
-        s = s.strip()
-
-        name, value = s.split(':')
-        name = name.strip()
-        value = value.strip()
-
-        parts = name.split('.')
-        n = parts.pop()
-
-        kstat[n] = Decimal(value)
+        name, unused, value = s.split()
+        kstat[name] = Decimal(value)
 
 
 def snap_stats():

diff --git a/configure.ac b/configure.ac
index 13bb5baf71d188f492be6322f8133d793f85f590..58e21587051afd8a616070ab1d9dd14d82a733c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,7 @@ AC_CONFIG_FILES([
        cmd/fsck_zfs/Makefile
        cmd/zvol_id/Makefile
        cmd/vdev_id/Makefile
+       cmd/arcstat/Makefile
        module/Makefile
        module/avl/Makefile
        module/nvpair/Makefile

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 7ee4ca018e31c849491a377d4c9e861395d7b06d..ddbee84a44a32eb8fb9788de3fd782e04daef225 100644 (file)
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -123,6 +123,7 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
 %doc AUTHORS COPYRIGHT DISCLAIMER
 %doc OPENSOLARIS.LICENSE README.markdown
 %{_sbindir}/*
+%{_bindir}/*
 %{_libdir}/*.so.1*
 %{_mandir}/man1/*
 %{_mandir}/man5/*