Kaydet (Commit) 453aeef3 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

avoid deadlocks in BENCHMARK_MODE

Change-Id: I1f994ecb6efbd302430062421ccc953dee904741
üst 96f373e2
...@@ -509,6 +509,12 @@ public: ...@@ -509,6 +509,12 @@ public:
void GL3DBarChart::moveToDefault() void GL3DBarChart::moveToDefault()
{ {
if(BENCH_MARK_MODE)
{
// add correct handling here!!
return;
}
if(mpRenderThread.is()) if(mpRenderThread.is())
mpRenderThread->join(); mpRenderThread->join();
...@@ -540,6 +546,12 @@ void GL3DBarChart::clickedAt(const Point& rPos, sal_uInt16 nButtons) ...@@ -540,6 +546,12 @@ void GL3DBarChart::clickedAt(const Point& rPos, sal_uInt16 nButtons)
if(nButtons != MOUSE_LEFT) if(nButtons != MOUSE_LEFT)
return; return;
if (BENCH_MARK_MODE)
{
// add correct handling here !!
return;
}
sal_uInt32 nId = 5; sal_uInt32 nId = 5;
{ {
PickingModeSetter aPickingModeSetter(mpRenderer.get()); PickingModeSetter aPickingModeSetter(mpRenderer.get());
...@@ -592,6 +604,7 @@ void GL3DBarChart::render() ...@@ -592,6 +604,7 @@ void GL3DBarChart::render()
{ {
if (BENCH_MARK_MODE) if (BENCH_MARK_MODE)
return; return;
osl::MutexGuard aGuard(maMutex); osl::MutexGuard aGuard(maMutex);
update(); update();
} }
...@@ -650,6 +663,12 @@ glm::vec3 GL3DBarChart::getCornerPosition(sal_Int8 nId) ...@@ -650,6 +663,12 @@ glm::vec3 GL3DBarChart::getCornerPosition(sal_Int8 nId)
void GL3DBarChart::moveToCorner() void GL3DBarChart::moveToCorner()
{ {
if(BENCH_MARK_MODE)
{
// add correct handling here!!
return;
}
osl::MutexGuard aGuard(maMutex); osl::MutexGuard aGuard(maMutex);
if(mpRenderThread.is()) if(mpRenderThread.is())
mpRenderThread->join(); mpRenderThread->join();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment