Reduce session loading time by validating contents concurrently

BlueBrain · Jul 18, 2016 · d2f39e6 · d2f39e6
1 parent dfd4543
commit d2f39e6
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 46 deletions.
diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -3,6 +3,8 @@ Changelog {#Changelog}
 
 # Release 1.2 (git master)
 
+* [64](https://github.com/BlueBrain/Tide/pull/64):
+  Faster session loading and fix for FFMPEG thread safety issues.
 * [63](https://github.com/BlueBrain/Tide/pull/63):
   Several corrections and bugfixes for session loading. Due to an error in
   [#28](https://github.com/BlueBrain/Tide/pull/28), some sessions saved

diff --git a/tide/core/FFMPEGMovie.cpp b/tide/core/FFMPEGMovie.cpp
@@ -51,6 +51,28 @@
 #pragma clang diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
+// Solve FFMPEG issue "insufficient thread locking around avcodec_open/close()"
+int ffmpegLockManagerCallback( void** mutex, enum AVLockOp op )
+{
+    switch( op )
+    {
+    case AV_LOCK_CREATE:
+        *mutex = static_cast<void*>( new std::mutex( ));
+        return 0;
+    case AV_LOCK_OBTAIN:
+        static_cast<std::mutex*>( *mutex )->lock();
+        return 0;
+    case AV_LOCK_RELEASE:
+        static_cast<std::mutex*>( *mutex )->unlock();
+        return 0;
+    case AV_LOCK_DESTROY:
+        delete static_cast<std::mutex*>( *mutex );
+        return 0;
+    default:
+        return 1;
+    }
+}
+
 FFMPEGMovie::FFMPEGMovie( const QString& uri )
     : _avFormatContext( 0 )
     , _streamPosition( 0.0 )
@@ -123,6 +145,7 @@ void FFMPEGMovie::initGlobalState()
 
     if( !initialized )
     {
+        av_lockmgr_register( &ffmpegLockManagerCallback );
         av_register_all();
         initialized = true;
     }

diff --git a/tide/core/FFMPEGVideoStream.cpp b/tide/core/FFMPEGVideoStream.cpp
@@ -71,6 +71,8 @@ FFMPEGVideoStream::~FFMPEGVideoStream()
 {
 #if USE_NEW_FFMPEG_API
     avcodec_free_context( &_videoCodecContext );
+#else
+    avcodec_close( _videoCodecContext );
 #endif
 }
 
@@ -300,7 +302,6 @@ void FFMPEGVideoStream::_openVideoStreamDecoder()
         std::stringstream message;
         message << "Could not open codec, error code " << ret << ": " <<
                    _getAvError( ret );
-
         throw std::runtime_error( message.str( ));
     }
 }

diff --git a/tide/master/CMakeLists.txt b/tide/master/CMakeLists.txt
@@ -8,6 +8,8 @@ set(TIDEMASTER_LINK_LIBRARIES
   PUBLIC
     TideCore
     Qt5::Widgets
+  PRIVATE
+    Qt5::Concurrent
 )
 
 list(APPEND TIDEMASTER_PUBLIC_HEADERS

diff --git a/tide/master/StateSerializationHelper.cpp b/tide/master/StateSerializationHelper.cpp
@@ -105,61 +105,61 @@ bool _canBeRestored( const CONTENT_TYPE type )
     return true;
 }
 
-void _validateContents( DisplayGroup& group )
+bool _validateContent( const ContentWindowPtr& window )
 {
-    const ContentWindowPtrs& windows = group.getContentWindows();
+    ContentPtr content = window->getContent();
+    if( !content )
+    {
+        put_flog( LOG_WARN, "Window '%s' does not have a Content!",
+            window->getID().toString().toLocal8Bit().constData( ));
+        return false;
+    }
 
-    ContentWindowPtrs validContentWindows;
-    validContentWindows.reserve( windows.size( ));
+    if( !_canBeRestored( content->getType( )))
+        return false;
 
-    for( ContentWindowPtr contentWindow : windows )
+    // Some regular textures were saved as DynamicTexture type before the
+    // migration to qml2 rendering
+    if( content->getType() == CONTENT_TYPE_DYNAMIC_TEXTURE )
     {
-        ContentPtr content = contentWindow->getContent();
-        if( !content )
+        const QString& uri = content->getURI();
+        const auto type = ContentFactory::getContentTypeForFile( uri );
+        if( type == CONTENT_TYPE_TEXTURE )
         {
-            put_flog( LOG_WARN, "Window '%s' does not have a Content!",
-                contentWindow->getID().toString().toLocal8Bit().constData( ));
-            continue;
-        }
-
-        if( !_canBeRestored( content->getType( )))
-            continue;
+            put_flog( LOG_DEBUG, "Try restoring legacy DynamicTexture as "
+                                 "a regular texture: '%s'",
+                      content->getURI().toLocal8Bit().constData( ));
 
-        // Some regular textures were saved as DynamicTexture type before the
-        // migration to qml2 rendering
-        if( content->getType() == CONTENT_TYPE_DYNAMIC_TEXTURE )
-        {
-            const QString& uri = content->getURI();
-            const auto type = ContentFactory::getContentTypeForFile( uri );
-            if( type == CONTENT_TYPE_TEXTURE )
-            {
-                put_flog( LOG_DEBUG, "Try restoring legacy DynamicTexture as "
-                                     "a regular texture: '%s'",
-                          content->getURI().toLocal8Bit().constData( ));
-
-                content = ContentFactory::getContent( uri );
-                contentWindow->setContent( content );
-            }
+            content = ContentFactory::getContent( uri );
+            window->setContent( content );
         }
+    }
 
-        // Refresh content information, files can have been modified or removed
-        // since the state was saved.
-        if( content->readMetadata( ))
-        {
-            put_flog( LOG_DEBUG, "Restoring content: '%s'",
-                      content->getURI().toLocal8Bit().constData( ));
-        }
-        else
-        {
-            put_flog( LOG_WARN, "'%s' could not be restored!",
-                      content->getURI().toLocal8Bit().constData( ));
-            const QSize& size = content->getDimensions();
-            contentWindow->setContent( ContentFactory::getErrorContent( size ));
-        }
-        validContentWindows.push_back( contentWindow );
+    // Refresh content information, files can have been modified or removed
+    // since the state was saved.
+    if( content->readMetadata( ))
+    {
+        put_flog( LOG_DEBUG, "Restoring content: '%s'",
+                  content->getURI().toLocal8Bit().constData( ));
+    }
+    else
+    {
+        put_flog( LOG_WARN, "'%s' could not be restored!",
+                  content->getURI().toLocal8Bit().constData( ));
+        const QSize& size = content->getDimensions();
+        window->setContent( ContentFactory::getErrorContent( size ));
     }
+    return true;
+}
+
+void _validateContents( DisplayGroup& group )
+{
+    typedef QVector<ContentWindowPtr> Windows;
+    Windows windows = Windows::fromStdVector( group.getContentWindows( ));
+
+    QtConcurrent::blockingFilter( windows, _validateContent );
 
-    group.setContentWindows( validContentWindows );
+    group.setContentWindows( windows.toStdVector( ));
 }
 
 DisplayGroupConstPtr _load( const QString& filename, DisplayGroupConstPtr targetGroup )