starting rendering job, it try shared lock, else cancel

Framstag · Feb 2, 2024 · 578112c · 578112c
1 parent 8a0b70c
commit 578112c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 12 deletions.
diff --git a/libosmscout-client-qt/include/osmscoutclientqt/MapRenderer.h b/libosmscout-client-qt/include/osmscoutclientqt/MapRenderer.h
@@ -41,12 +41,18 @@ namespace osmscout {
  */
 class OSMSCOUT_CLIENT_QT_API DBRenderJob : public QObject, public DBJob{
   Q_OBJECT
+public:
+  enum RunStatus {
+    RunNotCompleted = 0,
+    RunSucceeded    = 1,
+    RunFailed
+  };
 private:
   osmscout::MercatorProjection renderProjection;
   QMap<QString,QMap<osmscout::TileKey,osmscout::TileRef>> tiles;
   osmscout::MapParameter *drawParameter;
   QPainter *p;
-  bool success;
+  RunStatus status;
   bool drawCanvasBackground;
   bool renderBasemap;
   bool renderDatabases;
@@ -70,8 +76,8 @@ class OSMSCOUT_CLIENT_QT_API DBRenderJob : public QObject, public DBJob{
            const std::list<DBInstanceRef> &allDatabases,
            ReadLock &&locker) override;
 
-  inline bool IsSuccess() const{
-    return success;
+  inline RunStatus Status() const{
+    return status;
   };
 
 private:

diff --git a/libosmscout-client-qt/src/osmscoutclientqt/MapRenderer.cpp b/libosmscout-client-qt/src/osmscoutclientqt/MapRenderer.cpp
@@ -243,7 +243,7 @@ DBRenderJob::DBRenderJob(osmscout::MercatorProjection renderProjection,
   tiles(tiles),
   drawParameter(drawParameter),
   p(p),
-  success(false),
+  status(RunNotCompleted),
   drawCanvasBackground(drawCanvasBackground),
   renderBasemap(renderBasemap),
   renderDatabases(renderDatabases),
@@ -262,7 +262,7 @@ void DBRenderJob::Run(const osmscout::BasemapDatabaseRef& basemapDatabase,
   }
   DBJob::Run(basemapDatabase,databases,std::move(locker));
 
-  success=true;
+  bool success = true;
 
   // draw background
   if (drawCanvasBackground){
@@ -369,6 +369,7 @@ void DBRenderJob::Run(const osmscout::BasemapDatabaseRef& basemapDatabase,
   success &= batch.paint(renderProjection,
                          *drawParameter,
                          p);
+  status = (success ? RunSucceeded : RunFailed);
   Close();
 }
 

diff --git a/libosmscout-client-qt/src/osmscoutclientqt/PlaneMapRenderer.cpp b/libosmscout-client-qt/src/osmscoutclientqt/PlaneMapRenderer.cpp
@@ -390,7 +390,7 @@ void PlaneMapRenderer::DrawMap()
     osmscout::GeoBox renderBox(projection.GetDimensions());
     getOverlayObjects(overlayObjects, renderBox);
 
-    bool success;
+    DBRenderJob::RunStatus status;
     {
       DBRenderJob job(renderProjection,
                       loadJob->GetAllTiles(),
@@ -400,7 +400,7 @@ void PlaneMapRenderer::DrawMap()
                       dbThread->GetEmptyStyleConfig(),
                       /*drawCanvasBackground*/ true);
       dbThread->RunJob(std::bind(&DBRenderJob::Run, &job, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
-      success=job.IsSuccess();
+      status=job.Status();
     }
 
 #ifdef DRAW_DEBUG
@@ -417,10 +417,17 @@ void PlaneMapRenderer::DrawMap()
       loadJob=nullptr;
     }
 
-    if (!success)  {
+    switch (status) {
+    case DBRenderJob::RunFailed:
       osmscout::log.Error() << "*** Rendering of data has error or was interrupted";
       return;
+    case DBRenderJob::RunNotCompleted:
+      osmscout::log.Info() << "Rendering was cancelled";
+      return;
+    default:
+      break;
     }
+
     {
       QMutexLocker finishedLocker(&finishedMutex);
       std::swap(currentImage,finishedImage);

diff --git a/libosmscout-client-qt/src/osmscoutclientqt/TiledMapRenderer.cpp b/libosmscout-client-qt/src/osmscoutclientqt/TiledMapRenderer.cpp
@@ -472,7 +472,7 @@ void TiledMapRenderer::onLoadJobFinished(QMap<QString,QMap<osmscout::TileKey,osm
     getOverlayObjects(overlayObjects, renderBox);
 
     //DrawMap(p, tileVisualCenter, loadZ, canvas.width(), canvas.height());
-    bool success;
+    DBRenderJob::RunStatus status;
     {
       DBRenderJob job(projection,
                       tiles,
@@ -484,16 +484,22 @@ void TiledMapRenderer::onLoadJobFinished(QMap<QString,QMap<osmscout::TileKey,osm
                       /*renderBasemap*/ !onlineTilesEnabled,
                       offlineTilesEnabled);
       dbThread->RunJob(std::bind(&DBRenderJob::Run, &job, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
-      success=job.IsSuccess();
+      status=job.Status();
     }
 
     // this slot is called from DBLoadJob, we can't delete it now
     loadJob->deleteLater();
     loadJob=nullptr;
 
-    if (!success)  {
+    switch (status) {
+    case DBRenderJob::RunFailed:
       osmscout::log.Error() << "*** Rendering of data has error or was interrupted";
       return;
+    case DBRenderJob::RunNotCompleted:
+      osmscout::log.Info() << "Rendering was cancelled";
+      return;
+    default:
+      break;
     }
 
     p.end();

diff --git a/libosmscout-client/src/osmscoutclient/DBThread.cpp b/libosmscout-client/src/osmscoutclient/DBThread.cpp
@@ -508,7 +508,13 @@ CancelableFuture<bool> DBThread::FlushCaches(const std::chrono::milliseconds &id
 
 void DBThread::RunJob(AsynchronousDBJob job)
 {
-  ReadLock locker(latch);
+  // try lock shared, else cancel
+  if (!latch.try_lock_shared()) {
+    return;
+  }
+  // keep the shared lock before handing over
+  ReadLock locker(latch, std::adopt_lock);
+
   if (!isInitializedInternal()){
     locker.unlock();
     osmscout::log.Warn() << "ignore request, dbs is not initialized";