Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 09:18:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

inserts synchronization primitives

Browse source
This commit is contained in:
tosh 2013-03-29 11:43:04 +01:00
parent 2b3263e019
commit 2d997a9a8d
2 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/starfield/Config.h
View file

@ -44,6 +44,9 @@
#include <stdint.h> #include <stdint.h>
#include <mutex>
#include <atomic>
#include <new> #include <new>
#include <vector> #include <vector>
#include <memory> #include <memory>

81
interface/src/starfield/Controller.h
View file

@ -56,20 +56,25 @@ namespace starfield {
class Controller { class Controller {
InputVertices _seqInput; mutex _mtxInput;
unsigned _valTileResolution; InputVertices _seqInput;
atomic<unsigned> _valTileResolution;
double _valLodFraction; mutex _mtxLodState;
double _valLodLowWaterMark; double _valLodFraction;
double _valLodHighWaterMark; double _valLodLowWaterMark;
double _valLodOveralloc; double _valLodHighWaterMark;
size_t _valLodNalloc; double _valLodOveralloc;
size_t _valLodNrender; size_t _valLodNalloc;
BrightnessLevels _seqLodBrightness; size_t _valLodNrender;
BrightnessLevel _valLodBrightness; BrightnessLevels _seqLodBrightness;
BrightnessLevel _valLodAllocBrightness; BrightnessLevel _valLodAllocBrightness;
Renderer* _ptrRenderer; atomic<BrightnessLevel> _valLodBrightness;
atomic<Renderer*> _ptrRenderer;
typedef lock_guard<mutex> lock;
public: public:
@ -108,12 +113,11 @@ namespace starfield {
// input is read, now run the entire data pipeline on the new input // input is read, now run the entire data pipeline on the new input
{ { lock _(_mtxInput);
// TODO input mutex
_seqInput.swap(vertices); _seqInput.swap(vertices);
unsigned k = _valTileResolution; unsigned k = _valTileResolution.load(memory_order_relaxed);
size_t n, nRender; size_t n, nRender;
BrightnessLevel bMin, b; BrightnessLevel bMin, b;
@ -122,7 +126,7 @@ namespace starfield {
// we'll have to build a new LOD state for a new total N, // we'll have to build a new LOD state for a new total N,
// ideally keeping allocation size and number of vertices // ideally keeping allocation size and number of vertices
{ // TODO lod mutex { lock _(_mtxLodState);
size_t newLast = _seqInput.size() - 1; size_t newLast = _seqInput.size() - 1;
@ -170,7 +174,7 @@ namespace starfield {
// finally publish the new LOD state // finally publish the new LOD state
{ // TODO lod mutex { lock _(_mtxLodState);
_seqLodBrightness.swap(brightness); _seqLodBrightness.swap(brightness);
_valLodFraction *= rcpChange; _valLodFraction *= rcpChange;
@ -180,8 +184,8 @@ namespace starfield {
_valLodNalloc = n; _valLodNalloc = n;
_valLodNrender = nRender; _valLodNrender = nRender;
_valLodAllocBrightness = bMin; _valLodAllocBrightness = bMin;
// keep last, it's accessed asynchronously
_valLodBrightness = b; _valLodBrightness.store(b, memory_order_relaxed);
} }
} }
@ -196,17 +200,17 @@ namespace starfield {
// fprintf(stderr, "Stars.cpp: setResolution(%d)\n", k); // fprintf(stderr, "Stars.cpp: setResolution(%d)\n", k);
if (k != _valTileResolution) { // TODO make atomic if (k != _valTileResolution.load(memory_order_relaxed)) {
// TODO input mutex lock _(_mtxInput);
unsigned n; unsigned n;
BrightnessLevel b, bMin; BrightnessLevel b, bMin;
{ // TODO lod mutex { lock _(_mtxLodState);
n = _valLodNalloc; n = _valLodNalloc;
b = _valLodBrightness; b = _valLodBrightness.load(memory_order_relaxed);
bMin = _valLodAllocBrightness; bMin = _valLodAllocBrightness;
} }
@ -249,7 +253,7 @@ namespace starfield {
BrightnessLevel bMin, b; BrightnessLevel bMin, b;
double fraction, lwm, hwm; double fraction, lwm, hwm;
{ // TODO lod mutex { lock _(_mtxLodState);
// acuire a consistent copy of the current LOD state // acuire a consistent copy of the current LOD state
fraction = _valLodFraction; fraction = _valLodFraction;
@ -276,8 +280,8 @@ namespace starfield {
b = _seqLodBrightness[nRender]; b = _seqLodBrightness[nRender];
// this setting controls the renderer, also keep b as the // this setting controls the renderer, also keep b as the
// brightness becomes volatile as soon as the mutex is // brightness becomes volatile as soon as the mutex is
// released // released, so keep b
_valLodBrightness = b; // TODO make atomic _valLodBrightness.store(b, memory_order_relaxed);
// fprintf(stderr, "Stars.cpp: " // fprintf(stderr, "Stars.cpp: "
// "fraction = %lf, oaFract = %lf, n = %d, n' = %d, bMin = %d, b = %d\n", // "fraction = %lf, oaFract = %lf, n = %d, n' = %d, bMin = %d, b = %d\n",
@ -294,13 +298,17 @@ namespace starfield {
} }
// reallocate // reallocate
{ // TODO input mutex
{ lock _(_mtxInput);
recreateRenderer(n, _valTileResolution, b, bMin); recreateRenderer(n, _valTileResolution, b, bMin);
// fprintf(stderr, "Stars.cpp: LOD reallocation\n"); // fprintf(stderr, "Stars.cpp: LOD reallocation\n");
// publish new lod state // publish new lod state
{ // TODO lod mutex
{ lock _(_mtxLodState);
_valLodNalloc = n; _valLodNalloc = n;
_valLodNrender = nRender; _valLodNrender = nRender;
@ -319,9 +327,7 @@ namespace starfield {
void recreateRenderer(size_t n, unsigned k, void recreateRenderer(size_t n, unsigned k,
BrightnessLevel b, BrightnessLevel bMin) { BrightnessLevel b, BrightnessLevel bMin) {
Renderer* renderer = new Renderer(_seqInput, n, k, b, bMin); delete _ptrRenderer.exchange(new Renderer(_seqInput, n, k, b, bMin) );
swap(_ptrRenderer, renderer); // TODO make atomic
delete renderer; // will be NULL when was in use
} }
public: public:
@ -329,22 +335,21 @@ namespace starfield {
void render(float perspective, float angle, mat4 const& orientation) { void render(float perspective, float angle, mat4 const& orientation) {
// check out renderer // check out renderer
Renderer* renderer = 0l; Renderer* renderer = _ptrRenderer.exchange(0l);
swap(_ptrRenderer, renderer); // TODO make atomic
// have it render // have it render
if (renderer != 0l) { if (renderer != 0l) {
BrightnessLevel b = _valLodBrightness; // make atomic BrightnessLevel b = _valLodBrightness.load(memory_order_relaxed);
renderer->render(perspective, angle, orientation, b); renderer->render(perspective, angle, orientation, b);
} }
// check in - or dispose if there is a new one // check in - or dispose if there is a new one
// TODO make atomic (CAS) Renderer* newOne = 0l;
if (! _ptrRenderer) { if (! _ptrRenderer.compare_exchange_strong(newOne, renderer)) {
_ptrRenderer = renderer;
} else { assert(!! newOne);
delete renderer; delete renderer;
} }
} }