mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 02:29:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rollback pointer changes to _synchronizationBuffer.

Browse Source 
Was causing segfault on mutex locks during launch.
This commit is contained in:
Matthew Territo
2016-07-06 12:02:01 -06:00
parent c9ac04d3cd
commit da203364ba
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/util/syncbuffer.h
View File

@@ -107,7 +107,7 @@ private:
size_t _encodeOffset;
size_t _decodeOffset;
std::vector<char> _dataStream;
sgct::SharedVector<char>* _synchronizationBuffer;
sgct::SharedVector<char> _synchronizationBuffer;
};
} // namespace openspace

8
src/util/syncbuffer.cpp
View File

@@ -37,15 +37,15 @@ SyncBuffer::SyncBuffer(size_t n)
}
void SyncBuffer::write() {
_synchronizationBuffer->setVal(_dataStream);
sgct::SharedData::instance()->writeVector(_synchronizationBuffer);
_synchronizationBuffer.setVal(_dataStream);
sgct::SharedData::instance()->writeVector(&_synchronizationBuffer);
_encodeOffset = 0;
_decodeOffset = 0;
}
void SyncBuffer::read() {
sgct::SharedData::instance()->readVector(_synchronizationBuffer);
_dataStream = std::move(_synchronizationBuffer->getVal());
sgct::SharedData::instance()->readVector(&_synchronizationBuffer);
_dataStream = std::move(_synchronizationBuffer.getVal());
_encodeOffset = 0;
_decodeOffset = 0;
}