Complete rework of tile loading/thread

PBMap.pb

@@ -85,6 +85,7 @@ Module PBMap
     key.s
     CacheFile.s
     GetImageThread.i
+    RetryNb.i
     Layer.i
   EndStructure
   
@@ -111,6 +112,7 @@ Module PBMap
   
   Structure ImgMemCach
     nImage.i
+    *Tile.Tile 
     ;Location.Location
     ;Mutex.i
   EndStructure
@@ -156,12 +158,13 @@ Module PBMap
     HDDCachePath.S                          ; Path where to load and save tiles downloaded from server
     MemCache.TileMemCach                    ; Images in memory cache
                                             ;
+    OnStage.i
     Redraw.i
     Moving.i
     Dirty.i                                 ; To signal that drawing need a refresh
                                             ;
     MainDrawingThread.i
-    List TilesThreads.TileThread()
+    ;List TilesThreads.TileThread()
     TileThreadMutex.i;                      ;Mutex to protect resources  
     List track.Location()                   ; To display a GPX track
     List Marker.Marker()                    ; To diplay marker
@@ -332,18 +335,21 @@ Module PBMap
     ;Wait for loading threads to finish nicely. Passed 2 seconds, kills them.
     Protected TimeCounter = ElapsedMilliseconds()
     Repeat
-      ResetList(PBMap\TilesThreads()) 
+      ForEach PBMap\MemCache\Images()
-      While NextElement(PBMap\TilesThreads())
+        If PBMap\MemCache\Images()\Tile <> 0         
-        If IsThread(PBMap\TilesThreads()\GetImageThread) = 0
+          If IsThread(PBMap\MemCache\Images()\Tile\GetImageThread)
-          FreeMemory(PBMap\TilesThreads()\Tile)
+            PBMap\MemCache\Images()\Tile\RetryNb = 0
-          DeleteElement(PBMap\TilesThreads())
+            If ElapsedMilliseconds() - TimeCounter > 2000
-        ElseIf ElapsedMilliseconds() - TimeCounter > 2000
               ;Should not occur
-          KillThread(PBMap\TilesThreads()\GetImageThread)
+              KillThread(PBMap\MemCache\Images()\Tile\GetImageThread)
             EndIf
-      Wend
+          EndIf
+        Else
+          DeleteMapElement(PBMap\MemCache\Images())
+        EndIf
+      Next
       Delay(10)
-    Until ListSize(PBMap\TilesThreads()) = 0 
+    Until MapSize(PBMap\MemCache\Images()) = 0 
     curl_global_cleanup()
   EndProcedure
   
@@ -475,27 +481,6 @@ Module PBMap
     ProcedureReturn -1
   EndProcedure
   
-  Procedure.i GetLocalTile(key.s, CacheFile.s)
-    Protected timg = -1
-    If FindMapElement(PBMap\MemCache\Images(), key)
-      MyDebug("Key : " + key + " found in memory cache!", 3)
-      ProcedureReturn PBMap\MemCache\Images()\nImage
-    Else
-      MyDebug("Trying to load from HDD " + CacheFile)
-      timg = GetTileFromHDD(CacheFile.s) 
-      If timg <> -1
-        MyDebug("Key : " + key + " found on HDD")
-        LockMutex(PBMap\TileThreadMutex)
-        AddMapElement(PBMap\MemCache\Images(), key)
-        PBMap\MemCache\Images()\nImage = timg  
-        UnlockMutex(PBMap\TileThreadMutex)
-      Else  
-        MyDebug("Key : " + key + " not found")
-      EndIf 
-        ProcedureReturn timg 
-    EndIf
-  EndProcedure
-
   Procedure.i GetTileFromWeb(Zoom.i, XTile.i, YTile.i, CacheFile.s, Layer.i)
     Protected *Buffer
     Protected nImage.i = -1
@@ -545,39 +530,95 @@ Module PBMap
   
   Procedure GetImageThread(*Tile.Tile)
     Protected nImage.i = -1
+    Repeat
       nImage = GetTileFromWeb(*Tile\PBMapZoom, *Tile\PBMapTileX, *Tile\PBMapTileY, *Tile\CacheFile, *Tile\Layer)
       If nImage <> -1
         LockMutex(PBMap\TileThreadMutex)
-      AddMapElement(PBMap\MemCache\Images(), *Tile\key) ;Add the image to the cache, once
         PBMap\MemCache\Images(*Tile\key)\nImage = nImage
         UnlockMutex(PBMap\TileThreadMutex)
-      MyDebug("Image key : " + *Tile\key + " added in memory cache!", 3)
+        MyDebug("Image key : " + *Tile\key + " web image loaded", 3)
-      *Tile\nImage = nImage
         PBMap\Dirty = #True
+        *Tile\RetryNb = 0
         ;      PostEvent(#PB_Event_Gadget, PBMap\Window, PBmap\Gadget, #PB_MAP_REDRAW, *Tile) ;If image is loaded from web, redraw
       Else 
-      PBMap\Dirty = #True
+        MyDebug("Image key : " + *Tile\key + " web image not correctly loaded", 3)
+        Delay(5000)
+        *Tile\RetryNb - 1
         ;      PostEvent(#PB_Event_Gadget, PBMap\Window, PBmap\Gadget, #PB_MAP_RETRY, *Tile) ;If image is not loaded, retry    
       EndIf
-
+    Until *Tile\RetryNb <= 0
+    ;End of the thread
+    LockMutex(PBMap\TileThreadMutex)
+    FreeMemory(PBMap\MemCache\Images(*Tile\key)\Tile)
+    PBMap\MemCache\Images(*Tile\key)\Tile = 0
+    UnlockMutex(PBMap\TileThreadMutex)    
   EndProcedure
   
-  Procedure DrawTile(*Tile.Tile)
+  Procedure.i GetTile(key.s, CacheFile.s, px.i, py.i, tilex.i, tiley.i, Layer.i)
-    Protected x = *Tile\Position\x 
+    Protected timg = -1
-    Protected y = *Tile\Position\y 
+    If FindMapElement(PBMap\MemCache\Images(), key)
-    MyDebug("  Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX), 2)
+      MyDebug("Key : " + key + " found in memory cache!", 3)
-    MyDebug("  at coords " + Str(x) + "," + Str(y), 2)
+      timg = PBMap\MemCache\Images()\nImage
-    MovePathCursor(x, y)
+      If timg <> -1        
-    DrawVectorImage(ImageID(*Tile\nImage))
+        MyDebug("Image : " + timg + " found in memory cache!", 3)
+        ProcedureReturn timg
+      EndIf
+    Else
+      AddMapElement(PBMap\MemCache\Images(), key)
+      MyDebug("Key : " + key + " added in memory cache!", 3)
+      PBMap\MemCache\Images()\nImage = -1
+      ;UnlockMutex(PBMap\TileThreadMutex)
+    EndIf
+    If PBMap\MemCache\Images()\Tile = 0 ;Check if a loading thread is not running
+      MyDebug("Trying to load from HDD " + CacheFile)
+      timg = GetTileFromHDD(CacheFile.s)
+      If timg <> -1
+        MyDebug("Key : " + key + " found on HDD")
+        PBMap\MemCache\Images()\nImage = timg  
+        ProcedureReturn timg
+      EndIf
+      MyDebug("Key : " + key + " not found on HDD")
+      ;Launch a new thread
+      Protected *NewTile.Tile = AllocateMemory(SizeOf(Tile))
+      If *NewTile
+        With *NewTile
+          PBMap\MemCache\Images()\Tile = *NewTile
+          ;New tile parameters
+          \Position\x = px 
+          \Position\y = py 
+          \PBMapTileX = tilex 
+          \PBMapTileY = tiley
+          \PBMapZoom  = PBMap\Zoom
+          \key = key
+          \CacheFile = CacheFile
+          \Layer = Layer
+          \RetryNb = 5
+          \GetImageThread = CreateThread(@GetImageThread(), *NewTile)
+          myDebug(" Creating get image thread nb " + Str(\GetImageThread))
+        EndWith  
+      Else
+        MyDebug(" Error, can't create a new tile loading thread")
+      EndIf   
+    EndIf 
+    ProcedureReturn timg 
   EndProcedure
   
-  Procedure DrawLoading(*Tile.Tile)
+  ;   Procedure DrawTile(*Tile.Tile)
-    Protected x = *Tile\Position\x 
+  ;     Protected x = *Tile\Position\x 
-    Protected y = *Tile\Position\y 
+  ;     Protected y = *Tile\Position\y 
-    Protected Text$ = "Loading"
+  ;     MyDebug("  Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX), 2)
-    MyDebug("  Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX), 2)
+  ;     MyDebug("  at coords " + Str(x) + "," + Str(y), 2)
-    MyDebug("  at coords " + Str(x) + "," + Str(y))
+  ;     MovePathCursor(x, y)
-  EndProcedure
+  ;     DrawVectorImage(ImageID(*Tile\nImage))
+  ;   EndProcedure
+  ;   
+  ;   Procedure DrawLoading(*Tile.Tile)
+  ;     Protected x = *Tile\Position\x 
+  ;     Protected y = *Tile\Position\y 
+  ;     Protected Text$ = "Loading"
+  ;     MyDebug("  Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX), 2)
+  ;     MyDebug("  at coords " + Str(x) + "," + Str(y))
+  ;   EndProcedure
   
   Procedure DrawTiles(*Drawing.DrawingParameters, Layer.i, alpha.i=255)
     ;DisableDebugger
@@ -601,53 +642,26 @@ Module PBMap
         key = Str(kq)
         CacheFile = PBMap\HDDCachePath + key + ".png"
         
-        img = GetLocalTile(key, CacheFile)
+        img = GetTile(key, CacheFile, px, py, tilex, tiley, Layer)
         If img <> -1  
           MovePathCursor(px, py)
           DrawVectorImage(ImageID(img), alpha)
         Else 
           MovePathCursor(px, py)
           DrawVectorImage(ImageID(PBMap\ImgLoading), alpha)
-          Protected *NewTile.Tile = AllocateMemory(SizeOf(Tile))
-          If *NewTile
-            With *NewTile
-              ;Keep a track of tiles (especially to free memory)
-              ;TODO : not sure if it really needs a mutex here, i'm still trying to find where the white tile issue is coming from
-              ;a tile download is either getting clobbered or timing out or getting kicked and it results in a corrupted png file on linux   
-              LockMutex(PBMap\TileThreadMutex)    
-              AddElement(PBMap\TilesThreads())
-              PBMap\TilesThreads()\Tile = *NewTile
-              UnlockMutex(PBMap\TileThreadMutex)
-              ;New tile parameters
-              \Position\x = px 
-              \Position\y = py 
-              \PBMapTileX = tilex 
-              \PBMapTileY = tiley
-              \PBMapZoom  = PBMap\Zoom
-              \key = key
-              \CacheFile = CacheFile
-              \Layer = Layer
-              \GetImageThread = CreateThread(@GetImageThread(), *NewTile)
-              PBMap\TilesThreads()\GetImageThread = \GetImageThread
-              myDebug(" Creating get image thread nb " + Str(\GetImageThread))
-            EndWith  
-          Else
-            MyDebug(" Error, can't create a new tile")
-            Break 2
-          EndIf   
         EndIf
       Next
     Next 
     
-    ;Free tile memory
+    ;     ;Free tile memory
-    ;TODO : maybe get out this proc from drawtiles in a special "free ressources" task
+    ;     ;TODO : maybe get out this proc from drawtiles in a special "free ressources" task
-    ForEach PBMap\TilesThreads()
+    ;     ForEach PBMap\TilesThreads()
-      ;Check if there's no more loading thread
+    ;       ;Check if there's no more loading thread
-      If IsThread(PBMap\TilesThreads()\GetImageThread) = 0
+    ;       If IsThread(PBMap\TilesThreads()\GetImageThread) = 0
-        FreeMemory(PBMap\TilesThreads()\Tile)
+    ;         FreeMemory(PBMap\TilesThreads()\Tile)
-        DeleteElement(PBMap\TilesThreads())
+    ;         DeleteElement(PBMap\TilesThreads())
-      EndIf         
+    ;       EndIf         
-    Next
+    ;     Next
     
   EndProcedure
   
@@ -809,6 +823,7 @@ Module PBMap
   Procedure Drawing()
     Protected *Drawing.DrawingParameters = @PBMap\Drawing
     Protected Px.d, Py.d,a
+    PBMap\OnStage = #True
     PBMap\Dirty = #False
     PBMap\Redraw = #False
     ;Precalc some values
@@ -836,7 +851,15 @@ Module PBMap
     MovePathCursor(50,50)
     DrawVectorText(Str(MapSize(PBMap\MemCache\Images())))
     MovePathCursor(50,80)
-    DrawVectorText(Str(ListSize(PBMap\TilesThreads())))
+    Protected ThreadCounter = 0
+    ForEach PBMap\MemCache\Images()
+      If PBMap\MemCache\Images()\Tile <> 0
+        If PBMap\MemCache\Images()\Tile\GetImageThread <> 0
+          ThreadCounter + 1
+        EndIf
+      EndIf
+    Next
+    DrawVectorText(Str(ThreadCounter))
     ;If PBMap\Options\ShowScale
     DrawScale(*Drawing,10,GadgetHeight(PBMAP\Gadget)-20,192)
     ;EndIf 
@@ -846,6 +869,7 @@ Module PBMap
     ;       PBMap\Redraw = #True
     ;       ;PostEvent(#PB_Event_Gadget, PBMap\Window, PBmap\Gadget, #PB_MAP_REDRAW)
     ;     EndIf
+    PBMap\OnStage = #False
   EndProcedure
   
   Procedure Refresh()
@@ -1083,7 +1107,7 @@ Module PBMap
   EndProcedure
   
   Procedure TimerEvents()
-    If EventTimer() = PBMap\Timer And (PBMap\Redraw Or PBMap\Dirty)
+    If EventTimer() = PBMap\Timer And (PBMap\Redraw Or PBMap\Dirty) And PBMap\OnStage = #False
       Drawing()
     EndIf    
   EndProcedure 
@@ -1246,9 +1270,9 @@ CompilerIf #PB_Compiler_IsMainFile
   
 CompilerEndIf
 ; IDE Options = PureBasic 5.50 (Windows - x64)
-; CursorPosition = 840
+; CursorPosition = 570
-; FirstLine = 819
+; FirstLine = 520
-; Folding = ----------
+; Folding = ---------
 ; EnableThread
 ; EnableXP
 ; EnableUnicode