Support thread cancelation, and handle ^C in the client.

2 files changed, 10 insertions, 3 deletions

diff --git a/libdimension-python/dimension.pxd b/libdimension-python/dimension.pxd
index 5523cc0..a3523d0 100644
--- a/libdimension-python/dimension.pxd
+++ b/libdimension-python/dimension.pxd
@@ -71,6 +71,7 @@ cdef extern from "../libdimension/dimension.h":
   ctypedef struct dmnsn_progress
 
   int dmnsn_finish_progress(dmnsn_progress *progress)
+  void dmnsn_cancel_progress(dmnsn_progress *progress)
   double dmnsn_get_progress(dmnsn_progress *progress)
   void dmnsn_wait_progress(dmnsn_progress *progress, double prog)
 
diff --git a/libdimension-python/dimension.pyx b/libdimension-python/dimension.pyx
index 673dc50..0c0c214 100644
--- a/libdimension-python/dimension.pyx
+++ b/libdimension-python/dimension.pyx
@@ -60,15 +60,21 @@ cdef class Progress:
       finally:
         self._progress = NULL
 
+  def cancel(self):
+    self._assert_unfinished()
+    dmnsn_cancel_progress(self._progress)
+
   def progress(self):
-    if self._progress == NULL:
-      raise RuntimeError("background task finished.")
+    self._assert_unfinished()
     return dmnsn_get_progress(self._progress)
 
   def wait(self, progress):
+    self._assert_unfinished()
+    dmnsn_wait_progress(self._progress, progress)
+
+  def _assert_unfinished(self):
     if self._progress == NULL:
       raise RuntimeError("background task finished.")
-    dmnsn_wait_progress(self._progress, progress)
 
 cdef _Progress(dmnsn_progress *progress):
   cdef Progress self = Progress.__new__(Progress)