mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correctly increase the reference count on PerformanceManager

Browse Source
This commit is contained in:
Alexander Bock
2016-08-01 23:55:49 +02:00
parent 9b84511a11
commit 3312ebd0fe
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: c8b3c9a18c...3b3a4c86b1

13
src/performance/performancemanager.cpp
View File

@@ -78,6 +78,10 @@ void PerformanceManager::createGlobalSharedMemory() {
sharedMemory.acquireLock();
GlobalMemory* m = reinterpret_cast<GlobalMemory*>(sharedMemory.memory());
++(m->referenceCount);
LINFO(
"Using global shared memory block for performance measurements. "
"Reference count: " << int(m->referenceCount)
);
sharedMemory.releaseLock();
}
else {
@@ -107,7 +111,9 @@ void PerformanceManager::destroyGlobalSharedMemory() {
sharedMemory.acquireLock();
GlobalMemory* m = reinterpret_cast<GlobalMemory*>(sharedMemory.memory());
--(m->referenceCount);
LINFO("Global shared performance memory reference count: " << m->referenceCount);
if (m->referenceCount == 0) {
LINFO("Removing global shared performance memory");
SharedMemory::remove(GlobalSharedMemoryName);
}
sharedMemory.releaseLock();
@@ -126,14 +132,17 @@ PerformanceManager::PerformanceManager()
// The the first free block (which also coincides with the number of blocks
uint8_t blockIndex = m->number;
++(m->number);
std::string localName = LocalSharedMemoryNameBase + std::to_string(blockIndex);
// Compute the total size
const int totalSize = sizeof(PerformanceLayout);
LINFO("Create shared memory of " << totalSize << " bytes");
LINFO("Create shared memory '" + localName + "' of " << totalSize << " bytes");
if (SharedMemory::exists(localName)) {
throw ghoul::RuntimeError("Shared Memory block already existed");
throw ghoul::RuntimeError(
"Shared Memory '" + localName + "' block already existed"
);
}
ghoul::SharedMemory::create(localName, totalSize);