michaelDCurran · Sep 23, 2019 · Sep 20, 2019 · Sep 21, 2019 · Sep 21, 2019 · Sep 21, 2019
@@ -228,7 +228,10 @@ def startMonitoring(self):
 		"""
 		if self._monitorThread:
 			return
-		thread = self._monitorThread = threading.Thread(target=self._monitor)
+		thread = self._monitorThread = threading.Thread(
+			name=f"{self.__class__.__qualname__}._monitorThread",
+>
+		)
 		thread.daemon = True
 		self._keepMonitoring = True
 		self._event.clear()

@@ -173,7 +173,10 @@ def __init__(self):
 		self.MTAThreadInitEvent=threading.Event()
 		self.MTAThreadStopEvent=threading.Event()
 		self.MTAThreadInitException=None
-		self.MTAThread=threading.Thread(target=self.MTAThreadFunc)
+		self.MTAThread = threading.Thread(
+			name=f"{self.__class__.__module__}.{self.__class__.__qualname__}.MTAThread",
+>
+		)
 		self.MTAThread.daemon=True
 		self.MTAThread.start()
 		self.MTAThreadInitEvent.wait(2)

@@ -2030,7 +2030,10 @@ def start(cls):
 		if cls.thread:
 			return
 		cls.queuedWriteLock = threading.Lock()
-		thread = cls.thread = threading.Thread(target=cls.func)
+		thread = cls.thread = threading.Thread(
+			name=f"{cls.__module__}.{cls.__qualname__}",
+>
+		)
 		thread.daemon = True
 		thread.start()
 		cls.handle = ctypes.windll.kernel32.OpenThread(winKernel.THREAD_SET_CONTEXT, False, thread.ident)

@@ -889,6 +889,15 @@ class ExecAndPump(threading.Thread):
 	"""Executes the given function with given args and kwargs in a background thread while blocking and pumping in the current thread."""
 
 	def __init__(self,func,*args,**kwargs):
+		if hasattr(func, "__qualname__"):  # _FuncPtr doesn't have this
+			if hasattr(func, "__func__"):
+				fname = func.__func__.__module__
+			else:
+				fname = func.__module__
+			fname += f".{func.__qualname__}"
+		else:
+			fname = repr(func)
+		self.name = f"{self.__class__.__module__}.{self.__class__.__qualname__}({fname})"
 		self.func=func
 		self.args=args
 		self.kwargs=kwargs

@@ -1,8 +1,7 @@
-#logHandler.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2007-2019 NV Access Limited, Rui Batista, Joseph Lee, Leonard de Ruijter
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2007-2019 NV Access Limited, Rui Batista, Joseph Lee, Leonard de Ruijter, Babbage B.V.
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
 """Utilities and classes to manage logging in NVDA"""
 
@@ -226,6 +225,8 @@ def handle(self,record):
 		return super().handle(record)
 
 class Formatter(logging.Formatter):
+	default_time_format = "%H:%M:%S"
+	default_msec_format = "%s.%03d"
 
 	def formatException(self, ex):
 		return stripBasePathFromTracebackText(super(Formatter, self).formatException(ex))
@@ -295,9 +296,12 @@ def initialize(shouldDoRemoteLogging=False):
 	logging.addLevelName(Logger.OFF, "OFF")
 	if not shouldDoRemoteLogging:
 		# This produces log entries such as the following:
-		# IO - inputCore.InputManager.executeGesture (09:17:40.724):
+		# IO - inputCore.InputManager.executeGesture (09:17:40.724) - Thread-5 (13576):
 		# Input: kb(desktop):v
-		logFormatter=Formatter("%(levelname)s - %(codepath)s (%(asctime)s.%(msecs)03d):\n%(message)s", "%H:%M:%S")
+		logFormatter = Formatter(
+			fmt="{levelname!s} - {codepath!s} ({asctime}) - {threadName} ({thread}):\n{message}",
+			style="{"
+		)
 		if (globalVars.appArgs.secure or globalVars.appArgs.noLogging) and (not globalVars.appArgs.debugLogging and globalVars.appArgs.logLevel == 0):
 			# Don't log in secure mode.
 			# #8516: also if logging is completely turned off.
@@ -319,7 +323,10 @@ def initialize(shouldDoRemoteLogging=False):
 			logHandler = FileHandler(globalVars.appArgs.logFileName, mode="w",encoding="utf-8")
 	else:
 		logHandler = RemoteHandler()
-		logFormatter = Formatter("%(codepath)s:\n%(message)s")
+		logFormatter = Formatter(
+			fmt="{codepath!s}:\n{message}",
+			style="{"
+		)
 	logHandler.setFormatter(logFormatter)
 	log.addHandler(logHandler)
 	redirectStdout(log)

@@ -17,6 +17,7 @@
 import wave
 import config
 from logHandler import log
+import os.path
 
 __all__ = (
 	"WavePlayer", "getOutputDeviceNames", "outputDeviceIDToName", "outputDeviceNameToID",
@@ -398,7 +399,10 @@ def playWaveFile(fileName, asynchronous=True):
 	if asynchronous:
 		if fileWavePlayerThread is not None:
 			fileWavePlayerThread.join()
-		fileWavePlayerThread=threading.Thread(target=fileWavePlayer.idle)
+		fileWavePlayerThread = threading.Thread(
+			name=f"{__name__}.playWaveFile({os.path.basename(fileName)})",
+>
+		)
 		fileWavePlayerThread.start()
 	else:
 		fileWavePlayer.idle()

@@ -74,7 +74,10 @@ def initialize():
 	global server
 	server = socketserver.TCPServer(("", PORT), RequestHandler)
 	server.daemon_threads = True
-	thread = threading.Thread(target=server.serve_forever)
+	thread = threading.Thread(
+		name=__name__,  # remotePythonConsole
+>
+	)
 	thread.daemon = True
 	thread.start()
 

@@ -178,7 +178,7 @@ def callback(wav,numsamples,event):
 
 class BgThread(threading.Thread):
 	def __init__(self):
-		threading.Thread.__init__(self)
+		super().__init__(name=f"{self.__class__.__module__}.{self.__class__.__qualname__}")
 		self.setDaemon(True)
 
 	def run(self):

@@ -206,10 +206,9 @@ def getDisplayTextForIdentifier(cls, identifier):
 inputCore.registerGestureSource("ts", TouchInputGesture)
 
 class TouchHandler(threading.Thread):
-
 	def __init__(self):
 		self.pendingEmitsTimer=gui.NonReEntrantTimer(core.requestPump)
-		super(TouchHandler,self).__init__()
+		super().__init__(name=f"{self.__class__.__module__}.{self.__class__.__qualname__}")
 		self._curTouchMode='object'
 		self.initializedEvent=threading.Event()
 		self.threadExc=None

@@ -225,7 +225,10 @@ class UpdateChecker(object):
 	def check(self):
 		"""Check for an update.
 		"""
-		t = threading.Thread(target=self._bg)
+		t = threading.Thread(
+			name=f"{self.__class__.__module__}.{self.check.__qualname__}",
+>
+		)
 		t.daemon = True
 		self._started()
 		t.start()
@@ -580,7 +583,10 @@ def start(self):
 			style=wx.PD_CAN_ABORT | wx.PD_ELAPSED_TIME | wx.PD_REMAINING_TIME | wx.PD_AUTO_HIDE,
 			parent=gui.mainFrame)
 		self._progressDialog.Raise()
-		t = threading.Thread(target=self._bg)
+		t = threading.Thread(
+			name=f"{self.__class__.__module__}.{self.start.__qualname__}",
+>
+		)
 		t.daemon = True
 		t.start()
 

@@ -433,7 +433,10 @@ def _get_isReady(self):
 	def loadBuffer(self):
 		self.isLoading = True
 		self._loadProgressCallLater = wx.CallLater(1000, self._loadProgress)
-		threading.Thread(target=self._loadBuffer).start()
+		threading.Thread(
+			name=f"{self.__class__.__module__}.{self.loadBuffer.__qualname__}",
+>
+		)
 
 	def _loadBuffer(self):
 		try:

@@ -241,7 +241,10 @@ def __init__(self):
 		self.contextToRectMap = {}
 		winGDI.gdiPlusInitialize()
 		self.window = None
-		self._highlighterThread = threading.Thread(target=self._run)
+		self._highlighterThread = threading.Thread(
+			name=f"{self.__class__.__module__}.{self.__class__.__qualname__}",
+>
+		)
 		self._highlighterThread.daemon = True
 		self._highlighterThread.start()
 

@@ -209,7 +209,10 @@ def initialize():
 		"cancelCallEvent")
 	# Handle cancelled SendMessage calls.
 	NVDAHelper._setDllFuncPointer(NVDAHelper.localLib, "_notifySendMessageCancelled", _notifySendMessageCancelled)
-	_watcherThread=threading.Thread(target=_watcher)
+	_watcherThread = threading.Thread(
+		name=__name__,
+>
+	)
 	alive()
 	_watcherThread.start()
 
@@ -254,6 +257,15 @@ def __init__(self):
 		self.isUsable = True
 
 	def execute(self, func, *args, pumpMessages=True, **kwargs):
+		if hasattr(func, "__qualname__"):  # _FuncPtr doesn't have this
+			if hasattr(func, "__func__"):
+				fname = func.__func__.__module__
+			else:
+				fname = func.__module__
+			fname += f".{func.__qualname__}"
+		else:
+			fname = repr(func)
+		self.name = f"{self.__class__.__module__}.{self.execute.__qualname__}({fname})"
 		# Don't even bother making the call if the core is already dead.
 		if isAttemptingRecovery:
 			raise CallCancelled

@@ -1,8 +1,7 @@
-#winInputHook.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2006-2008 NVDA Contributors <http://www.nvda-project.org/>
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2006-2019 NV Access Limited
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
 import threading
 import comtypes.client
@@ -88,7 +87,10 @@ def initialize():
 	global hookThread, hookThreadRefCount
 	hookThreadRefCount+=1
 	if hookThreadRefCount==1:
-		hookThread=threading.Thread(target=hookThreadFunc)
+		hookThread = threading.Thread(
+			name=__name__,  # winInputHook
+>
+		)
 		hookThread.start()
 
 def setCallbacks(keyUp=None,keyDown=None,mouse=None):