mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 09:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make PerformanceManager not crash if performance measurements are requested multiple times

Browse Source
This commit is contained in:
Alexander Bock
2016-06-27 15:02:40 +02:00
parent 824da2199f
commit 90d9f09909
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/performance/performancemanager.cpp
+8 -11
View File
@@ -46,16 +46,14 @@ PerformanceManager::PerformanceManager()
// Compute the total size
const int totalSize = sizeof(PerformanceLayout);
LINFO("Create shared memory of " << totalSize << " bytes");
try {
ghoul::SharedMemory::remove(PerformanceMeasurementSharedData);
}
catch (const ghoul::SharedMemory::SharedMemoryError& e) {
LINFOC(e.component, e.what());
}
if (ghoul::SharedMemory::exists(PerformanceMeasurementSharedData))
LWARNING("Shared memory for Performance measurements already existed.");
ghoul::SharedMemory::create(PerformanceMeasurementSharedData, totalSize);
_performanceMemory = new ghoul::SharedMemory(PerformanceMeasurementSharedData);
_performanceMemory = std::make_unique<ghoul::SharedMemory>(PerformanceMeasurementSharedData);
void* ptr = _performanceMemory->memory();
// Using the placement-new to create a PerformanceLayout in the shared memory
@@ -63,8 +61,7 @@ PerformanceManager::PerformanceManager()
}
PerformanceManager::~PerformanceManager() {
if (ghoul::SharedMemory::exists(PerformanceMeasurementSharedData))
ghoul::SharedMemory::remove(PerformanceMeasurementSharedData);
ghoul::SharedMemory::remove(PerformanceMeasurementSharedData);
}
void PerformanceManager::resetPerformanceMeasurements() {