From 05f701c66bb73e2d71a379d15a6c79348ba4d1a7 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Mon, 17 Apr 2017 16:52:40 +0100
Subject: [PATCH] async.TaskThread has a waitUntilIdle method, which causes
calling thread to block until queue is empty. ImageWrapper has method to
access TaskThread. This is primarily used for testing threaded access to
ImageWrapper.
---
fsl/data/imagewrapper.py | 15 ++++++++++++---
fsl/utils/async.py | 9 +++++++++
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/fsl/data/imagewrapper.py b/fsl/data/imagewrapper.py
index 458865eaf..9e66baa4c 100644
--- a/fsl/data/imagewrapper.py
+++ b/fsl/data/imagewrapper.py
@@ -229,6 +229,15 @@ class ImageWrapper(notifier.Notifier):
self.__taskThraed = None
+ def getTaskThread(self):
+ """If this ``ImageWrapper`` was created with ``threaded=True``,
+ this method returns the ``TaskThread`` that is used for running
+ data range calculation tasks. Otherwise, this method returns
+ ``False``.
+ """
+ return self.__taskThread
+
+
def reset(self, dataRange=None):
"""Reset the internal state and known data range of this
``ImageWrapper``.
@@ -745,9 +754,9 @@ def isValidFancySliceObj(sliceobj, shape):
object.
``nibabel`` refers to slice objects as "fancy" if they comprise anything
- but tuples of simple ``slice`` objects. The ``ImageWrapper`` class
- supports one type of "fancy" slicing, where the ``sliceobj`` is a boolean
- ``numpy`` array of the same shape as the image.
+ but tuples of integers and simple ``slice`` objects. The ``ImageWrapper``
+ class supports one type of "fancy" slicing, where the ``sliceobj`` is a
+ boolean ``numpy`` array of the same shape as the image.
This function returns ``True`` if the given ``sliceobj`` adheres to these
requirements, ``False`` otherwise.
diff --git a/fsl/utils/async.py b/fsl/utils/async.py
index e2969732e..cd9f05e74 100644
--- a/fsl/utils/async.py
+++ b/fsl/utils/async.py
@@ -679,6 +679,12 @@ class TaskThread(threading.Thread):
self.__stop = True
+ def waitUntilIdle(self):
+ """Causes the calling thread to block until the task queue is empty.
+ """
+ self.__q.join()
+
+
def run(self):
"""Run the ``TaskThread``. """
@@ -703,6 +709,7 @@ class TaskThread(threading.Thread):
self.__enqueued.pop(task.name, None)
if not task.enabled:
+ self.__q.task_done()
continue
log.debug('Running task: {} [{}]'.format(
@@ -733,6 +740,8 @@ class TaskThread(threading.Thread):
type(e).__name__,
str(e)),
exc_info=True)
+ finally:
+ self.__q.task_done()
self.__q = None
self.__enqueued = None
--
GitLab