firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 03:23:04 +01:00
Code Issues

Avoid unnecessary operations in the destructor. This also prevents possible hangs in Classic builds.

Browse Source
This commit is contained in:
Dmitry Yemanov 2020-01-12 10:38:31 +03:00
parent 675e7e0171
commit a9923c92af
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jrd/Monitoring.cpp
View File

@ -133,13 +133,20 @@ MonitoringData::MonitoringData(const Database* dbb)
MonitoringData::~MonitoringData()
{
Guard guard(this);
m_sharedMemory->mutexLock();
if (m_sharedMemory->getHeader() &&
m_sharedMemory->getHeader()->used == alignOffset(sizeof(Header)))
try
{
m_sharedMemory->removeMapFile();
if (m_sharedMemory->getHeader() &&
m_sharedMemory->getHeader()->used == alignOffset(sizeof(Header)))
{
m_sharedMemory->removeMapFile();
}
}
catch (const Exception&)
{} // no-op
m_sharedMemory->mutexUnlock();
}