use threads to allow signal handling

1 files changed, 52 insertions, 0 deletions

diff --git a/py/modules/IcePy/Util.h b/py/modules/IcePy/Util.h
index 0cab651227b..f49a521fd5c 100644
--- a/py/modules/IcePy/Util.h
+++ b/py/modules/IcePy/Util.h
@@ -14,6 +14,9 @@
 #include <Ice/BuiltinSequences.h>
 #include <Ice/Current.h>
 #include <Ice/Exception.h>
+#include <IceUtil/Thread.h>
+#include <IceUtil/Monitor.h>
+#include <IceUtil/Mutex.h>
 
 namespace IcePy
 {
@@ -139,6 +142,55 @@ bool setIdentity(PyObject*, const Ice::Identity&);
 //
 bool getIdentity(PyObject*, Ice::Identity&);
 
+//
+// This class invokes a member function in a separate thread.
+//
+template<typename T>
+class InvokeThread : public IceUtil::Thread
+{
+public:
+
+    InvokeThread(const IceInternal::Handle<T>& target, void (T::*func)(void),
+                 IceUtil::Monitor<IceUtil::Mutex>& monitor, bool& done) :
+        _target(target), _func(func), _monitor(monitor), _done(done), _ex(0)
+    {
+    }
+
+    ~InvokeThread()
+    {
+        delete _ex;
+    }
+
+    virtual void run()
+    {
+        try
+        {
+            (_target.get() ->* _func)();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            _ex = ex.ice_clone();
+        }
+
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
+        _done = true;
+        _monitor.notify();
+    }
+
+    Ice::Exception* getException() const
+    {
+        return _ex;
+    }
+
+private:
+
+    IceInternal::Handle<T> _target;
+    void (T::*_func)(void);
+    IceUtil::Monitor<IceUtil::Mutex>& _monitor;
+    bool& _done;
+    Ice::Exception* _ex;
+};
+
 }
 
 extern "C" PyObject* IcePy_identityToString(PyObject*, PyObject*);