[Freevo-cvslog] freevo/src childapp.py,1.1,1.2

[<di...@us...>]

Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23638

Modified Files:
	childapp.py 
Log Message:
Sometimes mplayer won't die. Now childapp will kill -9 the child after
it refuses 2 seconds to die.


Index: childapp.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/childapp.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** childapp.py	24 Nov 2002 13:58:44 -0000	1.1
--- childapp.py	21 Dec 2002 18:31:10 -0000	1.2
***************
*** 10,13 ****
--- 10,17 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.2  2002/12/21 18:31:10  dischi
+ # Sometimes mplayer won't die. Now childapp will kill -9 the child after
+ # it refuses 2 seconds to die.
+ #
  # Revision 1.1  2002/11/24 13:58:44  dischi
  # code cleanup
***************
*** 99,103 ****
          try:
              if signal:
!                 if DEBUG: print 'childapp: killing pid %s' % self.child.pid
                  os.kill(self.child.pid, signal)
              
--- 103,108 ----
          try:
              if signal:
!                 if DEBUG: print 'childapp: killing pid %s signal %s' % \
!                    (self.child.pid, signal)
                  os.kill(self.child.pid, signal)
              
***************
*** 105,109 ****
              try:
                  if DEBUG: print 'childapp: Before wait(%s)' % self.child.pid
!                 self.child.wait()
                  if DEBUG: print 'childapp: After wait()'
              except:
--- 110,121 ----
              try:
                  if DEBUG: print 'childapp: Before wait(%s)' % self.child.pid
!                 for i in range(20):
!                     if os.waitpid(self.child.pid, os.WNOHANG)[0] == self.child.pid:
!                         break
!                     time.sleep(0.1)
!                 else:
!                     print 'force killing with signal 9'
!                     os.kill(self.child.pid, 9)
!                     self.child.wait()
                  if DEBUG: print 'childapp: After wait()'
              except: