X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScenery%2Fnewcache.cxx;h=0ba6176f8acb61f26feb6301caa41976fcd7d3ae;hb=0fe90a83dd5df063252c10f50d9f8320e9055637;hp=4968b08e0fed26da8cf2370edb0bbc8404f85d80;hpb=4d4cd1601205be27e12c0748e6eda5b8beed0dc8;p=flightgear.git diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx index 4968b08e0..0ba6176f8 100644 --- a/src/Scenery/newcache.cxx +++ b/src/Scenery/newcache.cxx @@ -25,13 +25,6 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - -#include -#include - #include // plib include #include @@ -51,7 +44,7 @@ SG_USING_NAMESPACE(std); // Constructor FGNewCache::FGNewCache( void ) : - max_cache_size(50) + max_cache_size(100) { tile_cache.clear(); } @@ -105,6 +98,7 @@ bool FGNewCache::exists( const SGBucket& b ) const { } +#if 0 // Ensure at least one entry is free in the cache bool FGNewCache::make_space() { SG_LOG( SG_TERRAIN, SG_DEBUG, "Make space in cache" ); @@ -119,8 +113,10 @@ bool FGNewCache::make_space() { while ( (int)tile_cache.size() >= max_cache_size ) { sgdVec3 abs_view_pos; float dist; - float max_dist = 0.0; + double timestamp = 0.0; int max_index = -1; + double min_time = 2419200000.0f; // one month should be enough + double max_time = 0; // we need to free the furthest entry tile_map_iterator current = tile_cache.begin(); @@ -129,41 +125,30 @@ bool FGNewCache::make_space() { for ( ; current != end; ++current ) { long index = current->first; FGTileEntry *e = current->second; - if ( e->is_loaded() && (e->get_pending_models() == 0) ) { - // calculate approximate distance from view point - sgdCopyVec3( abs_view_pos, - globals->get_current_view()->get_absolute_view_pos() ); - - SG_LOG( SG_TERRAIN, SG_DEBUG, "DIST Abs view pos = " - << abs_view_pos[0] << "," - << abs_view_pos[1] << "," - << abs_view_pos[2] ); - SG_LOG( SG_TERRAIN, SG_DEBUG, - " ref point = " << e->center ); - - sgdVec3 center; - sgdSetVec3( center, - e->center.x(), e->center.y(), e->center.z() ); - dist = sgdDistanceVec3( center, abs_view_pos ); - SG_LOG( SG_TERRAIN, SG_DEBUG, " distance = " << dist ); + timestamp = e->get_timestamp(); + if ( timestamp < min_time ) { + max_index = index; + min_time = timestamp; + } + if ( timestamp > max_time ) { + max_time = timestamp; + } - if ( dist > max_dist ) { - max_dist = dist; - max_index = index; - } } else { - SG_LOG( SG_TERRAIN, SG_INFO, "loaded = " << e->is_loaded() - << " pending models = " << e->get_pending_models() ); + SG_LOG( SG_TERRAIN, SG_DEBUG, "loaded = " << e->is_loaded() + << " pending models = " << e->get_pending_models() + << " time stamp = " << e->get_timestamp() ); } } // If we made it this far, then there were no open cache entries. - // We will instead free the furthest cache entry and return true + // We will instead free the oldest cache entry and return true - SG_LOG( SG_TERRAIN, SG_INFO, " max_dist = " << max_dist ); - SG_LOG( SG_TERRAIN, SG_INFO, " index = " << max_index ); + SG_LOG( SG_TERRAIN, SG_DEBUG, " min_time = " << min_time ); + SG_LOG( SG_TERRAIN, SG_DEBUG, " index = " << max_index ); + SG_LOG( SG_TERRAIN, SG_DEBUG, " max_time = " << max_time ); if ( max_index >= 0 ) { entry_free( max_index ); return true; @@ -178,12 +163,59 @@ bool FGNewCache::make_space() { "FGNewCache::make_space()." ); return false; } +#endif + + +// Return the index of the oldest tile in the cache, return -1 if +// nothing available to be removed. +long FGNewCache::get_oldest_tile() { + // we need to free the furthest entry + long min_index = -1; + double timestamp = 0.0; + double min_time = 2419200000.0f; // one month should be enough + double max_time = 0; + + tile_map_iterator current = tile_cache.begin(); + tile_map_iterator end = tile_cache.end(); + + for ( ; current != end; ++current ) { + long index = current->first; + FGTileEntry *e = current->second; + if ( e->is_loaded() && (e->get_pending_models() == 0) ) { + + timestamp = e->get_timestamp(); + if ( timestamp < min_time ) { + min_index = index; + min_time = timestamp; + } + if ( timestamp > max_time ) { + max_time = timestamp; + } + + } else { + SG_LOG( SG_TERRAIN, SG_DEBUG, "loaded = " << e->is_loaded() + << " pending models = " << e->get_pending_models() + << " time stamp = " << e->get_timestamp() ); + } + } + + SG_LOG( SG_TERRAIN, SG_DEBUG, " min_time = " << min_time ); + SG_LOG( SG_TERRAIN, SG_DEBUG, " index = " << min_index ); + SG_LOG( SG_TERRAIN, SG_DEBUG, " max_time = " << max_time ); + + return min_index; +} + + +// Clear a cache entry, note that the cache only holds pointers +// and this does not free the object which is pointed to. +void FGNewCache::clear_entry( long cache_index ) { + tile_cache.erase( cache_index ); +} // Clear all completely loaded tiles (ignores partially loaded tiles) void FGNewCache::clear_cache() { - // This is a hack that should really get cleaned up at some point - extern ssgBranch *terrain_branch; tile_map_iterator current = tile_cache.begin(); tile_map_iterator end = tile_cache.end(); @@ -199,7 +231,7 @@ void FGNewCache::clear_cache() { } // and ... just in case we missed something ... - terrain_branch->removeAllKids(); + globals->get_scenery()->get_terrain_branch()->removeAllKids(); } @@ -207,17 +239,93 @@ void FGNewCache::clear_cache() { * Create a new tile and schedule it for loading. */ bool FGNewCache::insert_tile( FGTileEntry *e ) { - // clear out a distant entry in the cache if needed. - if ( make_space() ) { - // register it in the cache - long tile_index = e->get_tile_bucket().gen_index(); - tile_cache[tile_index] = e; + // set time of insertion for tracking age of tiles... + e->set_timestamp(globals->get_sim_time_sec()); + + // register it in the cache + long tile_index = e->get_tile_bucket().gen_index(); + tile_cache[tile_index] = e; - return true; - } else { - // failed to find cache space + return true; +} + + +// Note this is the old version of FGNewCache::make_space(), currently disabled +// It uses distance from a center point to determine tiles to be discarded... +#if 0 +// Ensure at least one entry is free in the cache +bool FGNewCache::make_space() { + SG_LOG( SG_TERRAIN, SG_DEBUG, "Make space in cache" ); + SG_LOG( SG_TERRAIN, SG_DEBUG, "cache entries = " << tile_cache.size() ); + SG_LOG( SG_TERRAIN, SG_DEBUG, "max size = " << max_cache_size ); - return false; + if ( (int)tile_cache.size() < max_cache_size ) { + // space in the cache, return + return true; } + + while ( (int)tile_cache.size() >= max_cache_size ) { + sgdVec3 abs_view_pos; + float dist; + float max_dist = 0.0; + int max_index = -1; + + // we need to free the furthest entry + tile_map_iterator current = tile_cache.begin(); + tile_map_iterator end = tile_cache.end(); + + for ( ; current != end; ++current ) { + long index = current->first; + FGTileEntry *e = current->second; + + if ( e->is_loaded() && (e->get_pending_models() == 0) ) { + // calculate approximate distance from view point + sgdCopyVec3( abs_view_pos, + globals->get_current_view()->get_absolute_view_pos() ); + + SG_LOG( SG_TERRAIN, SG_DEBUG, "DIST Abs view pos = " + << abs_view_pos[0] << "," + << abs_view_pos[1] << "," + << abs_view_pos[2] ); + SG_LOG( SG_TERRAIN, SG_DEBUG, + " ref point = " << e->center ); + + sgdVec3 center; + sgdSetVec3( center, + e->center.x(), e->center.y(), e->center.z() ); + dist = sgdDistanceVec3( center, abs_view_pos ); + + SG_LOG( SG_TERRAIN, SG_DEBUG, " distance = " << dist ); + + if ( dist > max_dist ) { + max_dist = dist; + max_index = index; + } + } else { + SG_LOG( SG_TERRAIN, SG_INFO, "loaded = " << e->is_loaded() + << " pending models = " << e->get_pending_models() ); + } + } + + // If we made it this far, then there were no open cache entries. + // We will instead free the furthest cache entry and return true + + SG_LOG( SG_TERRAIN, SG_INFO, " max_dist = " << max_dist ); + SG_LOG( SG_TERRAIN, SG_INFO, " index = " << max_index ); + if ( max_index >= 0 ) { + entry_free( max_index ); + return true; + } else { + SG_LOG( SG_TERRAIN, SG_ALERT, "WHOOPS!!! can't make_space(), tile " + "cache is full, but no entries available for removal." ); + return false; + } + } + + SG_LOG( SG_TERRAIN, SG_ALERT, "WHOOPS!!! Hit an unhandled condition in " + "FGNewCache::make_space()." ); + return false; } +#endif +