Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

sighandler() should take 2 arguments 

Stopping arcstat.py with ^C always ends up with error:
TypeError: sighandler() takes no arguments (2 given)

Since no special signal handling was done in sighandler(),
it's simpler to just set SIGINT handler to SIG_DFL, which
terminates the script.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Isaac Huang <he.huang@intel.com>
Closes #2179
This commit is contained in:
Isaac Huang 2014-03-11 17:05:46 -06:00 committed by Brian Behlendorf
parent d9119bd66d
commit 312f82ce65
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/arcstat/arcstat.py
View File

@ -51,7 +51,7 @@ import re
import copy import copy
from decimal import Decimal from decimal import Decimal
from signal import signal, SIGINT from signal import signal, SIGINT, SIG_DFL
cols = { cols = {
# HDR: [Size, Scale, Description] # HDR: [Size, Scale, Description]
@ -413,10 +413,6 @@ def calculate():
v["l2bytes"] = d["l2_read_bytes"] / sint v["l2bytes"] = d["l2_read_bytes"] / sint
def sighandler():
sys.exit(0)
def main(): def main():
global sint global sint
global count global count
@ -429,7 +425,7 @@ def main():
if count > 0: if count > 0:
count_flag = 1 count_flag = 1
signal(SIGINT, sighandler) signal(SIGINT, SIG_DFL)
while True: while True:
if i == 0: if i == 0:
print_header() print_header()