Added synchronous stopping of render threads

laralem · Nov 30, 2015 · 404c904 · 404c904
1 parent d7b1edc
commit 404c904
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 16 deletions.
diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
@@ -22,13 +22,12 @@ BackendRenderer::BackendRenderer(dp::RefPointer<ThreadsCommutator> commutator,
                                  dp::RefPointer<dp::OGLContextFactory> oglcontextfactory,
                                  dp::RefPointer<dp::TextureManager> textureManager,
                                  MapDataProvider const & model)
-  : BaseRenderer(commutator, oglcontextfactory)
+  : BaseRenderer(ThreadsCommutator::ResourceUploadThread, commutator, oglcontextfactory)
   , m_model(model)
   , m_engineContext(commutator)
   , m_texturesManager(textureManager)
   , m_guiCacher("default")
 {
-  m_commutator->RegisterThread(ThreadsCommutator::ResourceUploadThread, this);
   m_batchersPool.Reset(new BatchersPool(ReadManager::ReadCount(), bind(&BackendRenderer::FlushGeometry, this, _1)));
   m_readManager.Reset(new ReadManager(m_engineContext, m_model));
 
@@ -99,6 +98,11 @@ void BackendRenderer::AcceptMessage(dp::RefPointer<Message> message)
       m_batchersPool->ReleaseBatcher(key);
       break;
     }
+  case Message::StopRendering:
+    {
+      ProcessStopRenderingMessage();
+      break;
+    }
   default:
     ASSERT(false, ());
     break;

diff --git a/drape_frontend/base_renderer.cpp b/drape_frontend/base_renderer.cpp
@@ -1,21 +1,21 @@
 #include "base_renderer.hpp"
-#include "threads_commutator.hpp"
+#include "message_subclasses.hpp"
 #include "../std/utility.hpp"
 
-#include "../base/logging.hpp"
-
-
 namespace df
 {
 
-BaseRenderer::BaseRenderer(dp::RefPointer<ThreadsCommutator> commutator,
+BaseRenderer::BaseRenderer(ThreadsCommutator::ThreadName name,
+                           dp::RefPointer<ThreadsCommutator> commutator,
                            dp::RefPointer<dp::OGLContextFactory> oglcontextfactory)
   : m_commutator(commutator)
   , m_contextFactory(oglcontextfactory)
+  , m_threadName(name)
   , m_isEnabled(true)
   , m_renderingEnablingCompletionHandler(nullptr)
   , m_wasNotified(false)
 {
+  m_commutator->RegisterThread(m_threadName, this);
 }
 
 void BaseRenderer::StartThread()
@@ -25,13 +25,18 @@ void BaseRenderer::StartThread()
 
 void BaseRenderer::StopThread()
 {
-  IRoutine::Cancel();
+  // send message to stop rendering in render thread
+  m_commutator->PostMessage(m_threadName,
+                            dp::MovePointer<Message>(new StopRenderingMessage()),
+                            MessagePriority::High);
 
+  // wake up render thread if necessary
   if (!m_isEnabled)
   {
     WakeUp();
   }
-  CloseQueue();
+
+  // wait for render thread completion
   m_selfThread.Join();
 }
 
@@ -116,4 +121,10 @@ void BaseRenderer::WakeUp()
   m_renderingEnablingCondition.notify_one();
 }
 
+void BaseRenderer::ProcessStopRenderingMessage()
+{
+  CloseQueue();
+  IRoutine::Cancel();
+}
+
 } // namespace df
diff --git a/drape_frontend/base_renderer.hpp b/drape_frontend/base_renderer.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "message_acceptor.hpp"
+#include "threads_commutator.hpp"
 #include "../base/thread.hpp"
 #include "../drape/oglcontextfactory.hpp"
 
@@ -12,15 +13,14 @@
 namespace df
 {
 
-class ThreadsCommutator;
-
 class BaseRenderer : public MessageAcceptor,
                      public threads::IRoutine
 {
 public:
   using TCompletionHandler = function<void()>;
 
-  BaseRenderer(dp::RefPointer<ThreadsCommutator> commutator,
+  BaseRenderer(ThreadsCommutator::ThreadName name,
+               dp::RefPointer<ThreadsCommutator> commutator,
                dp::RefPointer<dp::OGLContextFactory> oglcontextfactory);
 
   void SetRenderingEnabled(bool const isEnabled);
@@ -32,10 +32,13 @@ class BaseRenderer : public MessageAcceptor,
 
   void StartThread();
   void StopThread();
+
   void CheckRenderingEnabled();
+  void ProcessStopRenderingMessage();
 
 private:
   threads::Thread m_selfThread;
+  ThreadsCommutator::ThreadName m_threadName;
 
   mutex m_renderingEnablingMutex;
   condition_variable m_renderingEnablingCondition;

diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
@@ -36,7 +36,7 @@ FrontendRenderer::FrontendRenderer(dp::RefPointer<ThreadsCommutator> commutator,
                                    dp::RefPointer<dp::OGLContextFactory> oglcontextfactory,
                                    dp::RefPointer<dp::TextureManager> textureManager,
                                    Viewport viewport)
-  : BaseRenderer(commutator, oglcontextfactory)
+  : BaseRenderer(ThreadsCommutator::RenderThread, commutator, oglcontextfactory)
   , m_textureManager(textureManager)
   , m_gpuProgramManager(new dp::GpuProgramManager())
   , m_viewport(viewport)
@@ -46,10 +46,9 @@ FrontendRenderer::FrontendRenderer(dp::RefPointer<ThreadsCommutator> commutator,
   m_fps = 0.0;
 #endif
 
-  m_commutator->RegisterThread(ThreadsCommutator::RenderThread, this);
-
   RefreshProjection();
   RefreshModelView();
+
   StartThread();
 }
 
@@ -221,6 +220,11 @@ void FrontendRenderer::AcceptMessage(dp::RefPointer<Message> message)
       m_guiRenderer->Build(m_gpuProgramManager.GetRefPointer());
       break;
     }
+  case Message::StopRendering:
+    {
+      ProcessStopRenderingMessage();
+      break;
+    }
   default:
     ASSERT(false, ());
   }

diff --git a/drape_frontend/message.hpp b/drape_frontend/message.hpp
@@ -21,7 +21,8 @@ class Message
     ClearUserMarkLayer,
     ChangeUserMarkLayerVisibility,
     UpdateUserMarkLayer,
-    GuiLayerRecached
+    GuiLayerRecached,
+    StopRendering
   };
 
   virtual ~Message() {}

diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp
@@ -242,4 +242,11 @@ class GuiLayerRecachedMessage : public Message
   dp::TransferPointer<gui::LayerRenderer> m_renderer;
 };
 
+class StopRenderingMessage : public Message
+{
+public:
+  StopRenderingMessage(){}
+  Type GetType() const override { return Message::StopRendering; }
+};
+
 } // namespace df