josch/neo1973-germany
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

FEATURE: asynchronous request if process is still running

Browse source 
git-svn-id: http://www.neo1973-germany.de/svn@44 46df4e5c-bc4e-4628-a0fc-830ba316316d
This commit is contained in:
kriss 2008-03-14 11:19:44 +00:00
parent e5e2fe294a
commit f94ba7c903
1 changed files with 84 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
SettingsGUI/trunk/src/settingsgui/ProcessInterface.py
View file

@ -2,11 +2,11 @@
* ProcessInterface.py - SettingsGUI - * ProcessInterface.py - SettingsGUI -
* Interface to interactive userspace processes * Interface to interactive userspace processes
* *
* Based on code from Jens Diemer <- ToDo - License * Based on code from Jens Diemer
* *
* Using libgsm_tool until there is a python bindung available * Using libgsm_tool until there is a python bindung available
* *
* (C) 2007 by Kristian Mueller <kristian-m@kristian-m.de> * (C) 2008 by Kristian Mueller <kristian-m@kristian-m.de>
* All Rights Reserved * All Rights Reserved
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -43,7 +43,8 @@ class error_poller(threading.Thread):
while self.keep_going: while self.keep_going:
self.error_stream.flush() self.error_stream.flush()
line = self.error_stream.readline() line = self.error_stream.readline()
if line == "": break if line == "":
break
self.out_data.append(line) self.out_data.append(line)
def stop(self): def stop(self):
@ -85,28 +86,12 @@ class async_process(threading.Thread):
self.keep_going = True self.keep_going = True
self.killed = False self.killed = False
self.closed = False
self.out_data = [] # output buffer <- ToDo use a list - for now '\n's self.out_data = [] # output buffer <- ToDo use a list - for now '\n's
self.events = [] self.events = []
threading.Thread.__init__(self) threading.Thread.__init__(self)
# print "COMMAND was >>%s<<" % self.command
self.start() self.start()
"""
if timeout > 0:
self.join( self.timeout )
else:
self.keep_going = True
while self.keep_going == True:
time.sleep(1)
self.join()
self.stop()
"""
# provide return code
#self.returncode = self.process.returncode
def run(self): def run(self):
print "Executes subprocess [%s]" % " ".join([self.command] + self.options) print "Executes subprocess [%s]" % " ".join([self.command] + self.options)
@ -127,21 +112,31 @@ class async_process(threading.Thread):
self.process = 0 self.process = 0
self.process_created_error = True self.process_created_error = True
self.process_created = True self.process_created = True
# save output # save output
line = "" line = ""
while self.keep_going: while self.keep_going:
char = "" char = ""
while char == "": while char == "":
char = self.process.stdout.read(1) if not isinstance(self.process, int):
if char == "": char = self.process.stdout.read(1)
## nonblocking? okay let's take a nap if char == "":
time.sleep(0.5) # print "[2]: %s" % self.closed
self.closed = True
#print "process [%s] finished" % \
# " ".join([self.command] + self.options)
return
else:
# print "[1]: %s" % self.closed
self.closed = True
#print "process [%s] finished" % \
# " ".join([self.command] + self.options)
return
line = line + char line = line + char
if line[-1] == "\n": if line[-1] == "\n":
self.out_data.append(line) self.out_data.append(line)
for event in self.events: for event in self.events:
if line.find(event[0]) >= 0: if line.find(event[0]) >= 0:
event[1](line) event[1](line)
@ -160,6 +155,7 @@ class async_process(threading.Thread):
""" """
if self.process.poll() != None: if self.process.poll() != None:
print " already killed" print " already killed"
self.closed = True
return return
print "trying to kill" print "trying to kill"
@ -170,21 +166,61 @@ class async_process(threading.Thread):
## have to kill - as readline is blocking. ## have to kill - as readline is blocking.
os.kill( self.process.pid, signal.SIGKILL ) os.kill( self.process.pid, signal.SIGKILL )
class ProcessInterface: class ProcessInterface:
def __init__(self, command): def __init__(self, command):
self.command = command.split()[0] self.command = command.split()[0]
self.options = [command.split()[x] for x in range(1,len(command.split()))] self.options = [command.split()[x] for x in range(1,len(command.split()))]
#"""
## ugly - handle options with spaces
new_options = []
new_option = ""
is_escaped = False
for option in self.options:
if option.find("\"") >= 0:
if not new_option == "":
new_option = "".join([new_option, " ", option])
new_options.append(new_option.strip().strip("\""))
# new_options.append(new_option)
new_option = ""
is_escaped = True
else:
new_option = option
is_escaped = True
if new_option == "" and not is_escaped:
## found something escaped string
new_options.append(option)
if new_option != "" and not is_escaped:
new_option = "".join([new_option, " ", option])
if len(option.split("\"")) >= 3:
new_options.append(option.strip().strip("\""))
is_escaped = False
self.options = new_options
#print "Options are: ---->%s<----" % self.options
# end ugly
#"""
self.process = async_process(self.command, self.options, "/", timeout = 0) self.process = async_process(self.command, self.options, "/", timeout = 0)
while self.process.process_created == False: while self.process.process_created == False:
if self.process.process_created_error: if self.process.process_created_error:
self.process.closed = True
return -1 return -1
time.sleep(0.1) time.sleep(0.1)
self.error_poller = error_poller(self.process.process.stderr) self.error_poller = error_poller(self.process.process.stderr)
## write string to buffer - new line is attached string ## write string to buffer - new line is attached string
def write_to_process(self, string): def write_to_process(self, string):
## find out if process is still running before wire ## find out if process is still running before writing
if self.process.closed:
return False
if self.process.process.poll() == None: # was == if self.process.process.poll() == None: # was ==
self.process.process.stdin.write("%s\n" % string) self.process.process.stdin.write("%s\n" % string)
self.process.process.stdin.flush() self.process.process.stdin.flush()
@ -229,12 +265,19 @@ class ProcessInterface:
def register_event_handler(self, event_name, function, args = [], kwargs = {}): def register_event_handler(self, event_name, function, args = [], kwargs = {}):
self.process.register_event_handler(event_name, function, args, kwargs) self.process.register_event_handler(event_name, function, args, kwargs)
def close(self):
self.close_process()
def close_process(self): def close_process(self):
print "trying to kill process"
self.process.keep_going = False self.process.keep_going = False
if not self.process.closed:
print "trying to kill process"
self.process.stop()
self.process.join(1) self.process.join(1)
self.process.stop()
self.process.join(1) def process_finished(self):
return self.process.closed
class test: class test:
@ -259,8 +302,20 @@ class test:
bash.close_process() bash.close_process()
print "halllooo" print "halllooo"
def finished_app_test(self):
ls = ProcessInterface("hcitool scan hci0")
while not ls.process_finished():
time.sleep(0.1) ## wait for command to compute
print "output of ls was [%s]" % ls.read_from_process()
# ToDo remove # ToDo remove
## self.process = subprocess.Popen(self.command, cwd = self.cwd, shell = True, stdout = subprocess.PIPE, stderr = subprocess.PIPE, stdin = subprocess.PIPE) ## self.process = subprocess.Popen(self.command, cwd = self.cwd, shell = True, stdout = subprocess.PIPE, stderr = subprocess.PIPE, stdin = subprocess.PIPE)
#test = test() #test = test()
#test.do_test() #test.do_test()