[CHANGE] - threadMain now moduleMain

[ADD] - proper exception handly in module threads

src/common/WException.cpp

@@ -56,6 +56,17 @@ WException::WException( const std::string& msg ): exception()
     }
 }
 
+WException::WException( const std::exception& e ): exception( e )
+{
+    m_msg = e.what();    
+
+    // print stacktrace and message
+    // no backtrace?
+    if ( !noBacktrace )
+    {
+        std::cerr << "Exception thrown! Callstack's backtrace:" << std::endl << getBacktrace() << std::endl;
+    }
+}
 
 WException::~WException() throw()
 {

src/common/WException.h

@@ -48,6 +48,13 @@ public:
      */
     explicit WException( const std::string& msg = std::string() );
 
+    /**
+     * Copy a std::exception and encapsulate it.
+     * 
+     * \param e the exception.
+     */
+    WException( const std::exception& e );
+
     /**
      * Destructor.
      */

src/kernel/WModule.cpp

@@ -36,6 +36,7 @@
 #include "exceptions/WModuleSignalSubscriptionFailed.h"
 #include "exceptions/WModuleConnectorInitFailed.h"
 #include "exceptions/WModuleUninitialized.h"
+#include "../common/WException.h"
 
 #include "WModule.h"
 
@@ -240,3 +241,23 @@ void WModule::connectToGui()
 {
 }
 
+void WModule::threadMain()
+{
+    try
+    {
+        // call main thread function
+        moduleMain();
+    }
+    catch ( WException& e )
+    {
+        // ensure proper exception propagation
+        signal_error( shared_from_this(), e );
+    }
+    catch ( std::exception& e )
+    {
+        // convert these exceptions to WException
+        WException ce = WException( e );
+        signal_error( shared_from_this(), ce );
+    }
+}
+

src/kernel/WModule.h

@@ -165,7 +165,12 @@ protected:
     /**
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain() = 0;
+    virtual void moduleMain() = 0;
+
+    /**
+     * Thread entry point. Calls moduleMain and sends error notification if needed.
+     */
+    void threadMain();
 
      /**
       * Sets the container this module is associated with.

src/kernel/test/WModuleConnector_test.h

@@ -108,7 +108,7 @@ protected:
     std::string n;
 
     // required since pure virtual
-    virtual void threadMain()
+    virtual void moduleMain()
     {
         // Since the modules run in a separate thread: such loops are possible
         while ( !m_FinishRequested )

src/modules/coordinateSystem/WMCoordinateSystem.cpp

@@ -47,7 +47,7 @@ boost::shared_ptr< WModule > WMCoordinateSystem::factory() const
     return boost::shared_ptr< WMCoordinateSystem >( new WMCoordinateSystem() );
 }
 
-void WMCoordinateSystem::threadMain()
+void WMCoordinateSystem::moduleMain()
 {
     createGeometry();
 

src/modules/coordinateSystem/WMCoordinateSystem.h

@@ -88,7 +88,7 @@ protected:
      * \par Description
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
 private:
     /**

src/modules/data/WMData.cpp

@@ -124,7 +124,7 @@ std::string getSuffix( std::string name )
     return p.extension();
 }
 
-void WMData::threadMain()
+void WMData::moduleMain()
 {
     std::string fileName = m_properties->getValue< std::string >( "filename" );
 

src/modules/data/WMData.h

@@ -90,7 +90,7 @@ protected:
      * \par Description
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
     /**
      * Initialize connectors in this function. This function must not be called multiple times for one module instance.

src/modules/eegTest/WMEEGTest.cpp

@@ -104,7 +104,7 @@ void drawChannel( boost::shared_ptr< const WEEG > eegData, size_t channelId, osg
     sceneDataGeode->addDrawable( textOne );
 }
 
-void WMEEGTest::threadMain()
+void WMEEGTest::moduleMain()
 {
     // load the sample scene.
     //osg::Geode* sceneDataGeode = new osg::Geode();

src/modules/eegTest/WMEEGTest.h

@@ -72,7 +72,7 @@ protected:
     /**
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
 private:
 };

src/modules/fiberClustering/WMFiberClustering.cpp

@@ -62,7 +62,7 @@ boost::shared_ptr< WModule > WMFiberClustering::factory() const
     return boost::shared_ptr< WModule >( new WMFiberClustering() );
 }
 
-void WMFiberClustering::threadMain()
+void WMFiberClustering::moduleMain()
 {
     boost::shared_ptr< WDataHandler > dataHandler;
     // TODO(math): fix this hack when possible by using an input connector.

src/modules/fiberClustering/WMFiberClustering.h

@@ -79,7 +79,7 @@ protected:
     /**
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
 private:
     /**

src/modules/fiberCulling/WMFiberCulling.cpp

@@ -58,7 +58,7 @@ boost::shared_ptr< WModule > WMFiberCulling::factory() const
     return boost::shared_ptr< WModule >( new WMFiberCulling() );
 }
 
-void WMFiberCulling::threadMain()
+void WMFiberCulling::moduleMain()
 {
     boost::shared_ptr< WDataHandler > dataHandler;
     // TODO(math): fix this hack when possible by using an input connector.

src/modules/fiberCulling/WMFiberCulling.h

@@ -76,7 +76,7 @@ protected:
     /**
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
     /**
      * Detect and removes fibers that have a short distance in terms of the

src/modules/fiberDisplay/WMFiberDisplay.cpp

@@ -97,7 +97,7 @@ osg::ref_ptr< osg::Geode > WMFiberDisplay::genFiberGeode( const wmath::WFiber &f
     return geode;
 }
 
-void WMFiberDisplay::threadMain()
+void WMFiberDisplay::moduleMain()
 {
     boost::shared_ptr< WDataHandler > dataHandler;
     // TODO(math): fix this hack when possible by using an input connector.

src/modules/fiberDisplay/WMFiberDisplay.h

@@ -73,7 +73,7 @@ protected:
     /**
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
     /**
      * Generates an OSG geometry for the given fiber.

src/modules/marchingCubes/WMMarchingCubes.cpp

@@ -83,7 +83,7 @@ const std::string WMMarchingCubes::getDescription() const
 }
 
 
-void WMMarchingCubes::threadMain()
+void WMMarchingCubes::moduleMain()
 {
     // TODO(wiebel): MC fix this hack when possible by using an input connector.
     while ( !WKernel::getRunningKernel() )

src/modules/marchingCubes/WMMarchingCubes.h

@@ -122,7 +122,7 @@ protected:
     /**
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
     /**
      * Initialize the connectors this module is using.

src/modules/navSlices/WMNavSlices.cpp

@@ -124,7 +124,7 @@ void WMNavSlices::notifyDataChange( boost::shared_ptr<WModuleConnector> input,
     // in this case input==m_input
 }
 
-void WMNavSlices::threadMain()
+void WMNavSlices::moduleMain()
 {
     createGeometry();
 

src/modules/navSlices/WMNavSlices.h

@@ -103,7 +103,7 @@ protected:
      * \par Description
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
     /**
      * Initialize the connectors this module is using.

src/modules/test/WMTest.cpp

@@ -58,7 +58,7 @@ const std::string WMTest::getDescription() const
     return "This module is for testing and development";
 }
 
-void WMTest::threadMain()
+void WMTest::moduleMain()
 {
     // load the sample scene.
     osg::ref_ptr<osg::Geode> sceneDataGeode = new osg::Geode();

src/modules/test/WMTest.h

@@ -72,7 +72,7 @@ protected:
     /**
      * Entry point after loading the module. Runs in separate thread.
      */
-    virtual void threadMain();
+    virtual void moduleMain();
 
 private:
 };