Skip to content

Commit

Permalink
pep8 code readability changes
Browse files Browse the repository at this point in the history
Update the code to follow the pep8 style guide.

References:
  http://www.python.org/dev/peps/pep-0008/

Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1838
  • Loading branch information
prometheanfire authored and behlendorf committed Nov 8, 2013
1 parent 7a4f546 commit 23bc1f9
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 85 deletions.
23 changes: 11 additions & 12 deletions cmd/arcstat/arcstat.py
Expand Up @@ -96,9 +96,9 @@

v = {}
hdr = ["time", "read", "miss", "miss%", "dmis", "dm%", "pmis", "pm%", "mmis",
"mm%", "arcsz", "c"]
"mm%", "arcsz", "c"]
xhdr = ["time", "mfu", "mru", "mfug", "mrug", "eskip", "mtxmis", "rmis",
"dread", "pread", "read"]
"dread", "pread", "read"]
sint = 1 # Default interval is 1 second
count = 1 # Default count is 1
hdr_intr = 20 # Print header every 20 lines of output
Expand All @@ -107,7 +107,7 @@
version = "0.4"
l2exist = False
cmd = ("Usage: arcstat.py [-hvx] [-f fields] [-o file] [-s string] [interval "
"[count]]\n")
"[count]]\n")
cur = {}
d = {}
out = None
Expand All @@ -129,12 +129,12 @@ def usage():
sys.stderr.write("%s\n" % cmd)
sys.stderr.write("\t -h : Print this help message\n")
sys.stderr.write("\t -v : List all possible field headers and definitions"
"\n")
"\n")
sys.stderr.write("\t -x : Print extended stats\n")
sys.stderr.write("\t -f : Specify specific fields to print (see -v)\n")
sys.stderr.write("\t -o : Redirect output to the specified file\n")
sys.stderr.write("\t -s : Override default field separator with custom "
"character or string\n")
"character or string\n")
sys.stderr.write("\nExamples:\n")
sys.stderr.write("\tarcstat.py -o /tmp/a.log 2 10\n")
sys.stderr.write("\tarcstat.py -s \",\" -o /tmp/a.log 2 10\n")
Expand Down Expand Up @@ -217,7 +217,7 @@ def print_values():
sys.stdout.write("%s%s" % (
prettynum(cols[col][0], cols[col][1], v[col]),
sep
))
))
sys.stdout.write("\n")


Expand Down Expand Up @@ -326,9 +326,8 @@ def init():
usage()

if len(incompat) > 0:
sys.stderr.write("Incompatible field specified! -- %s\n" % (
incompat,
))
sys.stderr.write("Incompatible field specified! -- %s\n" %
incompat)
usage()

if opfile:
Expand Down Expand Up @@ -363,16 +362,16 @@ def calculate():

v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) / sint
v["pmis"] = (d["prefetch_data_misses"] +
d["prefetch_metadata_misses"]) / sint
d["prefetch_metadata_misses"]) / sint

v["pread"] = v["phit"] + v["pmis"]
v["ph%"] = 100 * v["phit"] / v["pread"] if v["pread"] > 0 else 0
v["pm%"] = 100 - v["ph%"] if v["pread"] > 0 else 0

v["mhit"] = (d["prefetch_metadata_hits"] +
d["demand_metadata_hits"]) / sint
d["demand_metadata_hits"]) / sint
v["mmis"] = (d["prefetch_metadata_misses"] +
d["demand_metadata_misses"]) / sint
d["demand_metadata_misses"]) / sint

v["mread"] = v["mhit"] + v["mmis"]
v["mh%"] = 100 * v["mhit"] / v["mread"] if v["mread"] > 0 else 0
Expand Down

0 comments on commit 23bc1f9

Please sign in to comment.