Threaded tile paging:

[flightgear.git] / src / Scenery / FGTileLoader.cxx

diff --git a/src/Scenery/FGTileLoader.cxx b/src/Scenery/FGTileLoader.cxx
index 17cc52fc3b39c7cc9ba29c7bab946c9300ff39a9..8f04c78c8a7fb106011a0637d87ee78025d79fc1 100644 (file)
--- a/src/Scenery/FGTileLoader.cxx
+++ b/src/Scenery/FGTileLoader.cxx
@@ -86,12 +86,16 @@ FGTileLoader::add( FGTileEntry* tile )
        beenhere = true;
     }
 
-#ifdef ENABLE_THREADS
-    tile_queue.push( tile );
-#else
-    tile->load( tile_path, true );
-    tile->add_ssg_nodes( terrain, ground );
-#endif // ENABLE_THREADS
+    tile_load_queue.push( tile );
+}
+
+/**
+ * 
+ */
+void
+FGTileLoader::remove( FGTileEntry* tile )
+{
+    tile_free_queue.push( tile );
 }
 
 /**
@@ -101,9 +105,30 @@ void
 FGTileLoader::update()
 {
 #ifdef ENABLE_THREADS
+    // send a signal to the pager thread that it is allowed to load
+    // another tile
     mutex.lock();
     frame_cond.signal();
     mutex.unlock();
+#else
+    if ( !tile_load_queue.empty() ) {
+        cout << "loading next tile ..." << endl;
+        // load the next tile in the queue
+        FGTileEntry* tile = tile_load_queue.front();
+        tile_load_queue.pop();
+        tile->load( tile_path, true );
+        FGTileMgr::loaded( tile );
+    }
+
+    if ( !tile_free_queue.empty() ) {
+        cout << "freeing next tile ..." << endl;
+        // free the next tile in the queue
+        FGTileEntry* tile = tile_free_queue.front();
+        tile_free_queue.pop();
+       tile->free_tile();
+       delete tile;
+    }
+
 #endif // ENABLE_THREADS
 }
 
@@ -118,18 +143,27 @@ FGTileLoader::LoaderThread::run()
     pthread_cleanup_push( cleanup_handler, loader );
     while ( true ) {
        // Wait for a load request to be placed in the queue.
-       FGTileEntry* tile = loader->tile_queue.pop();
+       FGTileEntry* tile = loader->tile_load_queue.pop();
 
         // Wait for the next frame signal before we load a tile from the queue
-        // loader->mutex.lock();
-        // loader->frame_cond.wait( loader->mutex );
-        // loader->mutex.unlock();
+        loader->mutex.lock();
+        loader->frame_cond.wait( loader->mutex );
+        loader->mutex.unlock();
 
        set_cancel( SGThread::CANCEL_DISABLE );
        tile->load( loader->tile_path, true );
        set_cancel( SGThread::CANCEL_DEFERRED );
 
-       FGTileMgr::loaded( tile );
+       FGTileMgr::ready_to_attach( tile );
+
+       // Handle and pending removals
+       while ( !loader->tile_free_queue.empty() ) {
+           cout << "freeing next tile ..." << endl;
+           // free the next tile in the queue
+           FGTileEntry* tile = loader->tile_free_queue.pop();
+           tile->free_tile();
+           delete tile;
+       }
     }
     pthread_cleanup_pop(1);
 }