History

Make getHardwareStats thread safe

Atlante45 committed 9 years ago

Commit e5901fa1 parent f46b8f32 files · +16 −4Browse files

Showing the changes to plugins/oculus/src/OculusDisplayPlugin.cpp (1 of 2 files). Show all

Unified · Split

plugins/oculus/src/OculusDisplayPlugin.cpp+13−3
@@ -22,6 +22,13 @@ · 21 unmodified lines
22const char* OculusDisplayPlugin::NAME { "Oculus Rift" };22const char* OculusDisplayPlugin::NAME { "Oculus Rift" };
23static ovrPerfHudMode currentDebugMode = ovrPerfHud_Off;23static ovrPerfHudMode currentDebugMode = ovrPerfHud_Off;
24 24
25
26OculusDisplayPlugin::OculusDisplayPlugin() {
27 _appDroppedFrames.store(0);
28 _compositorDroppedFrames.store(0);
29}
30
31
25bool OculusDisplayPlugin::internalActivate() {32bool OculusDisplayPlugin::internalActivate() {
26 bool result = Parent::internalActivate();33 bool result = Parent::internalActivate();
27 currentDebugMode = ovrPerfHud_Off;34 currentDebugMode = ovrPerfHud_Off;
@@ -158,15 +165,18 @@ void OculusDisplayPlugin::hmdPresent() { · 130 unmodified lines
158 compositorDroppedFrames = frameStats.CompositorDroppedFrameCount;165 compositorDroppedFrames = frameStats.CompositorDroppedFrameCount;
159 appDroppedFrames = frameStats.AppDroppedFrameCount;166 appDroppedFrames = frameStats.AppDroppedFrameCount;
160 }167 }
161 _hardwareStats["app_dropped_frame_count"] = appDroppedFrames;168 _appDroppedFrames.store(appDroppedFrames);
162 _hardwareStats["compositor_dropped_frame_count"] = compositorDroppedFrames;169 _compositorDroppedFrames.store(compositorDroppedFrames);
163 }170 }
164 _presentRate.increment();171 _presentRate.increment();
165}172}
166 173
167 174
168QJsonObject OculusDisplayPlugin::getHardwareStats() const {175QJsonObject OculusDisplayPlugin::getHardwareStats() const {
169 return _hardwareStats;176 QJsonObject hardwareStats;
177 hardwareStats["app_dropped_frame_count"] = _appDroppedFrames.load();
178 hardwareStats["compositor_dropped_frame_count"] = _compositorDroppedFrames.load();
179 return hardwareStats;
170}180}
171 181
172bool OculusDisplayPlugin::isHmdMounted() const {182bool OculusDisplayPlugin::isHmdMounted() const {