mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-18 09:51:18 -06:00
* Simplest possible PBO implementation. * Add PBO class * TileLoadJob owns raw tile data * Working on a soluton to cache textures and reuse them * PBO and cached textures working for one texture type. Color textures. * Threadpool for tile requests uses LRU cache as queue * Remove framesUntilRequestFlush * Clean up * Clean up * Use prioritizing concurrent job manager * Use TileTextureInitData to initialize RawTileDataReader. * Class TextureContainer owns the textures to use for tiles. * Using TileTextureInitData to determine if new caches need to be created. * Remove WriteDataDescription * Remove TileDataLayout * Rendering many different layer types again * TileProviderByLevel gives layergroup id to tile providers * Comment away use of PBO * Erase unfinished requests to make room for new ones * Enable choice of PBO or not. * Enable resetting of asynctiledataprovider * Add the ability to use PBO and also load to CPU * Update ghoul * Solve culling issue. * Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider. * Add gpudata * Move fetching of shader preprocessing data to LayerManager * No comparisons to determine shader recompilation. * Show the tile cache size in the GUI * Clean up and comment. * Solve bug where float is interpreted as NaN * Enable ability to blend between layers again * Fix single image provider * Fix windows build error * Fix OSX compile issue. * Some clean up * Showing correct texture data size * Enable use of text tile providers again. No backgroupd image path however. * Change cache size from GUI * Clean up * Solve osx compilation error. * Update ghoul * Make it possible to switch between PBO and not during runtime. * Enable resetting of tile datasets * change function module in moduleengine to identify module by name * MemoryAwareTileCache is no longer a singleton * Update ownership of properties for globe browsing * Logging info about resetting tile reader. * Logging info * Fix requested changes * Fix some compile warnings. * Fix compilation warnings * Add ability to blend values with blend parameter. Also define settings through lua dict. * Fix some comments on pull request. * Change formatting * Change formatting * Change formatting * Fix pull request comments. * Those are details * Make Mercury great again. * Make Earth great again. * Solve conflict * Test to sometimes use valueblending and sometimes not * Not always use value blending * Update ghoul * Change from auto to explicit type. * Update test for LRU Cache * Include algorithm.
100 lines
4.3 KiB
C++
100 lines
4.3 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2017 *
|
|
* *
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
|
* software and associated documentation files (the "Software"), to deal in the Software *
|
|
* without restriction, including without limitation the rights to use, copy, modify, *
|
|
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
|
|
* permit persons to whom the Software is furnished to do so, subject to the following *
|
|
* conditions: *
|
|
* *
|
|
* The above copyright notice and this permission notice shall be included in all copies *
|
|
* or substantial portions of the Software. *
|
|
* *
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
|
|
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
|
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
|
|
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
|
****************************************************************************************/
|
|
|
|
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___LRU_THREAD_POOL___H__
|
|
#define __OPENSPACE_MODULE_GLOBEBROWSING___LRU_THREAD_POOL___H__
|
|
|
|
#include <modules/globebrowsing/cache/lrucache.h>
|
|
|
|
#include <condition_variable>
|
|
#include <functional>
|
|
#include <mutex>
|
|
#include <queue>
|
|
#include <thread>
|
|
#include <vector>
|
|
|
|
// Implementatin based on http://progsch.net/wordpress/?p=81
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
template<typename KeyType>
|
|
class LRUThreadPool;
|
|
|
|
template<typename KeyType>
|
|
class LRUThreadPoolWorker {
|
|
public:
|
|
LRUThreadPoolWorker(LRUThreadPool<KeyType>& pool);
|
|
void operator()();
|
|
private:
|
|
LRUThreadPool<KeyType>& _pool;
|
|
};
|
|
|
|
/**
|
|
* The <code>LRUThreadPool</code> will only enqueue a certain number of tasks. The most
|
|
* recently enqueued task is the one that will be executed first. This class is templated
|
|
* on a key type which used as an identifier to determine wheter or not a task with the
|
|
* given key has been enqueued or not. This means that a task can be enqueued several
|
|
* times. The user must ensure that an enqueued task with a given key should be
|
|
* equal in outcome to a second enqueued task with the same key. This is because a second
|
|
* enqueued task with the same key will simply be bumped and prioritised before other
|
|
* enqueued tasks. The given task will be ignored.
|
|
*/
|
|
template<typename KeyType>
|
|
class LRUThreadPool {
|
|
public:
|
|
LRUThreadPool(size_t numThreads, size_t queueSize);
|
|
~LRUThreadPool();
|
|
|
|
void enqueue(std::function<void()> f, KeyType key);
|
|
bool touch(KeyType key);
|
|
std::vector<KeyType> getQueuedTasksKeys();
|
|
std::vector<KeyType> getUnqueuedTasksKeys();
|
|
void clearEnqueuedTasks();
|
|
|
|
private:
|
|
|
|
struct DefaultHasher {
|
|
unsigned long long operator()(const KeyType& key) const {
|
|
return static_cast<unsigned long long>(key);
|
|
}
|
|
};
|
|
friend class LRUThreadPoolWorker<KeyType>;
|
|
|
|
std::vector<std::thread> _workers;
|
|
cache::LRUCache<KeyType, std::function<void()>, DefaultHasher> _queuedTasks;
|
|
std::vector<KeyType> _unqueuedTasks;
|
|
std::mutex _queueMutex;
|
|
std::condition_variable _condition;
|
|
|
|
bool _stop;
|
|
};
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|
|
|
|
#include "lruthreadpool.inl"
|
|
|
|
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LRU_THREAD_POOL___H__
|