[tor-commits] [arm/master] Dropping join on torctl's internal thread

[atagar at torproject.org]

commit 290eaa974ee4d36a99981109bc8a89fbcd392e01
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Jun 13 20:47:46 2011 -0700

    Dropping join on torctl's internal thread
    
    A fix for the root cause this addressed has been sent to Mike in...
    https://trac.torproject.org/projects/tor/ticket/2412
---
 src/util/torTools.py |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/src/util/torTools.py b/src/util/torTools.py
index a4c0b5d..5a47175 100644
--- a/src/util/torTools.py
+++ b/src/util/torTools.py
@@ -457,20 +457,6 @@ class Controller(TorCtl.PostEventListener):
     self.connLock.acquire()
     if self.conn:
       self.conn.close()
-      
-      # If we're closing due to an event from TorCtl (for instance, tor was
-      # stopped) then TorCtl is shutting itself down and there's no need to
-      # join on its thread (actually, this *is* the TorCtl thread in that
-      # case so joining on it causes deadlock).
-      # 
-      # This poses a slight possability of shutting down with a live orphaned
-      # thread if Tor is shut down, then arm shuts down before TorCtl has a
-      # chance to terminate. However, I've never seen that occure so leaving
-      # that alone for now.
-      
-      if not threading.currentThread() == self.conn._thread:
-        self.conn._thread.join()
-      
       self.conn = None
       self.connLock.release()