fixes for shutdown crashes

channel.cpp

@@ -139,6 +139,8 @@ LBINFO << "<----- Channel::configInit(" << initID << ")" << std::endl;
 
 bool Channel::configExit( )
 {
+LBINFO << "------ Channel::configExit( )" << std::endl;
+
     cleanup( );
 
     return eq::Channel::configExit( );
@@ -564,7 +566,7 @@ void Channel::worldPick( const eq::Vector3d& origin,
     }
 }
 
-void Channel::cleanup( )
+void Channel::clearScene( )
 {
     if( _camera.valid( ))
         connectCameraToScene( eq::uint128_t( ));
@@ -575,6 +577,11 @@ void Channel::cleanup( )
     _viewer2d = 0;
 }
 
+void Channel::cleanup( )
+{
+
+}
+
 void Channel::connectCameraToScene( const eq::uint128_t& id )
 {
     LB_TS_THREAD( _pipeThread );

channel.h

@@ -69,6 +69,9 @@ class Channel : public eq::Channel
         const eq::Vector3d& direction ) const;
 
 private:
+    friend class Window;
+    void clearScene( ); // Must call with GL context (i.e. Window::configExitGL)
+
     void cleanup( );
 
     void connectCameraToScene( const eq::uint128_t& id );

config.cpp

@@ -314,20 +314,17 @@ LBINFO << "-----> Config::exit( )" << std::endl;
     _viewer->shutdown( );
     _pager->cancel( );
 
-    // Clear scene graph before GL shutdown
-    _scene->removeChildren( 0, _scene->getNumChildren( ));
-
     // Clear view references before GL shutdown
     {
         ViewCollector m( this, true );
         accept( m );
     }
 
+    cleanup( );
+
     // Shutdown GL (destroys View, Channel, Window, Pipe, Node - basically everything)
     bool ret = eq::Config::exit( );
 
-    cleanup( );
-
 LBINFO << "<----- Config::exit( ) = " << ret << std::endl;
     return ret;
 }
@@ -853,6 +850,13 @@ static const char *zshaderFragSource = {
     return _scene.get( );
 }
 
+void Config::clearScene( )
+{
+    if( _scene.valid( ))
+        _scene->removeChildren( 0, _scene->getNumChildren( ));
+    //_scene->removeChild( osgEarth::findTopMostNodeOfType< osgEarth::Util::SkyNode >( _scene ));
+}
+
 void Config::cleanup( )
 {
     deregisterObject( &_initData );

config.h

@@ -57,6 +57,9 @@ class Config : public eq::Config
 private:
     osg::Group* getScene( const eq::uint128_t& sceneID, osgViewer::View* view );
 
+    friend class Window;
+    void clearScene( ); // Must call with GL context (i.e. Window::configExitGL)
+
     void cleanup( );
 
 protected:

node.cpp

@@ -191,6 +191,8 @@ LBINFO << "<----- Node::configInit(" << initID << ")" << std::endl;
 
 bool Node::configExit( )
 {
+LBINFO << "------ Node::configExit( )" << std::endl;
+
     cleanup( );
 
     return eq::Node::configExit( );

pipe.cpp

@@ -6,6 +6,8 @@ namespace eqEarth
 {
 // ----------------------------------------------------------------------------
 
+lunchbox::Lock Pipe::_pipeLock;
+
 Pipe::Pipe( eq::Node* parent )
     : eq::Pipe( parent )
 {
@@ -43,6 +45,10 @@ LBINFO << "<----- Pipe::configInit(" << initID << ")" << std::endl;
 
 bool Pipe::configExit( )
 {
+LBINFO << "------ Pipe::configExit( )" << std::endl;
+
+    lunchbox::ScopedWrite _mutex( Pipe::getPipeLock( ));
+
     cleanup( );
 
     return eq::Pipe::configExit( );

pipe.h

@@ -9,6 +9,8 @@ class Pipe : public eq::Pipe
 public:
     Pipe( eq::Node* parent );
 
+    static lunchbox::Lock *getPipeLock( ) { return &_pipeLock; };
+
 protected:
     virtual ~Pipe( );
 
@@ -25,5 +27,7 @@ class Pipe : public eq::Pipe
 
 private:
     void cleanup( );
+
+    static lunchbox::Lock _pipeLock;
 };
 }

window.cpp

@@ -1,5 +1,8 @@
+#include "channel.h"
 #include "window.h"
+#include "pipe.h"
 #include "node.h"
+#include "config.h"
 
 #include <osgEarth/Registry>
 
@@ -164,6 +167,8 @@ bool Window::configExitGL( )
 {
 LBINFO << "------ Window::configExitGL( )" << std::endl;
 
+    lunchbox::ScopedWrite _mutex( Pipe::getPipeLock( ));
+
     cleanup( );
 
     return eq::Window::configExitGL( );
@@ -227,13 +232,26 @@ void Window::swapBuffers( )
     eq::Window::swapBuffers( );
 }
 
+struct Window::ClearChannels : public eq::ConfigVisitor
+{
+virtual eq::VisitorResult visit( eq::Channel* channel )
+{
+    static_cast< Channel* >( channel )->clearScene( );
+}
+};
+
 void Window::cleanup( )
 {
     if( _window.valid( ))
     {
+        ClearChannels c;
+	accept( c );
+
+        static_cast< Config* >( getConfig( ))->clearScene( );
+
         static_cast< Node* >( getNode( ))->removeGraphicsContext( _window );
 
-        if( _window->valid( ))
+        if( _window.valid( ))
             _window->close( );
     }
 

window.h

@@ -40,6 +40,8 @@ class Window : public eq::Window
     virtual void swapBuffers( );
 
 private:
+    struct ClearChannels;
+
     void cleanup( );
 
 protected: