mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-21 20:09:00 -05:00
f51f293989
* 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.
142 lines
5.1 KiB
C++
142 lines
5.1 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. *
|
|
****************************************************************************************/
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
template<typename KeyType>
|
|
LRUThreadPoolWorker<KeyType>::LRUThreadPoolWorker(LRUThreadPool<KeyType>& pool)
|
|
: _pool(pool)
|
|
{}
|
|
|
|
template<typename KeyType>
|
|
void LRUThreadPoolWorker<KeyType>::operator()() {
|
|
std::function<void()> task;
|
|
while (true) {
|
|
// acquire lock
|
|
{
|
|
std::unique_lock<std::mutex> lock(_pool._queueMutex);
|
|
|
|
// look for a work item
|
|
while (!_pool._stop && _pool._queuedTasks.isEmpty()) {
|
|
// if there are none wait for notification
|
|
_pool._condition.wait(lock);
|
|
}
|
|
|
|
if (_pool._stop) { // exit if the pool is stopped
|
|
return;
|
|
}
|
|
|
|
// get the task from the queue
|
|
task = _pool._queuedTasks.popMRU().second;
|
|
|
|
}// release lock
|
|
|
|
// execute the task
|
|
task();
|
|
}
|
|
}
|
|
|
|
template<typename KeyType>
|
|
LRUThreadPool<KeyType>::LRUThreadPool(size_t numThreads, size_t queueSize)
|
|
: _queuedTasks(queueSize)
|
|
, _stop(false)
|
|
{
|
|
for (size_t i = 0; i < numThreads; ++i) {
|
|
_workers.push_back(std::thread(LRUThreadPoolWorker<KeyType>(*this)));
|
|
}
|
|
}
|
|
|
|
// the destructor joins all threads
|
|
template<typename KeyType>
|
|
LRUThreadPool<KeyType>::~LRUThreadPool() {
|
|
// Stop all threads
|
|
_stop = true;
|
|
_condition.notify_all();
|
|
|
|
// join them
|
|
for (size_t i = 0; i < _workers.size(); ++i) {
|
|
_workers[i].join();
|
|
}
|
|
}
|
|
|
|
// add new work item to the pool
|
|
template<typename KeyType>
|
|
void LRUThreadPool<KeyType>::enqueue(std::function<void()> f, KeyType key) {
|
|
{ // acquire lock
|
|
std::unique_lock<std::mutex> lock(_queueMutex);
|
|
|
|
// add the task
|
|
//_queuedTasks.put(key, f);
|
|
std::vector<std::pair<KeyType, std::function<void()>>> unfinishedTasks =
|
|
_queuedTasks.putAndFetchPopped(key, f);
|
|
for (auto unfinishedTask : unfinishedTasks) {
|
|
_unqueuedTasks.push_back(unfinishedTask.first);
|
|
}
|
|
} // release lock
|
|
|
|
// wake up one thread
|
|
_condition.notify_one();
|
|
}
|
|
|
|
template<typename KeyType>
|
|
bool LRUThreadPool<KeyType>::touch(KeyType key) {
|
|
std::unique_lock<std::mutex> lock(_queueMutex);
|
|
return _queuedTasks.touch(key);
|
|
}
|
|
|
|
|
|
template<typename KeyType>
|
|
std::vector<KeyType> LRUThreadPool<KeyType>::getUnqueuedTasksKeys() {
|
|
std::vector<KeyType> toReturn = _unqueuedTasks;
|
|
{
|
|
std::unique_lock<std::mutex> lock(_queueMutex);
|
|
_unqueuedTasks.clear();
|
|
}
|
|
return toReturn;
|
|
}
|
|
|
|
template<typename KeyType>
|
|
std::vector<KeyType> LRUThreadPool<KeyType>::getQueuedTasksKeys() {
|
|
std::vector<KeyType> queuedTasks;
|
|
{
|
|
std::unique_lock<std::mutex> lock(_queueMutex);
|
|
while (!_queuedTasks.isEmpty()) {
|
|
queuedTasks.push_back(_queuedTasks.popMRU().first);
|
|
}
|
|
}
|
|
return queuedTasks;
|
|
}
|
|
|
|
template<typename KeyType>
|
|
void LRUThreadPool<KeyType>::clearEnqueuedTasks() {
|
|
{ // acquire lock
|
|
std::unique_lock<std::mutex> lock(_queueMutex);
|
|
_queuedTasks.clear();
|
|
} // release lock
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|