epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

use epicsGuard

Browse Source
This commit is contained in:
Michael Davidsaver
2018-10-31 09:21:23 -07:00
parent f87e305733
commit 0959f9be88
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/remote/channelSearchManager.cpp
View File

@@ -346,15 +346,17 @@ void ChannelSearchManager::callback()
vector<SearchInstance::shared_pointer>::iterator siter = toSend.begin();
for (; siter != toSend.end(); siter++)
{
m_userValueMutex.lock();
int32_t& countValue = (*siter)->getUserValue();
bool skip = !isPowerOfTwo(countValue);
bool skip;
{
epicsGuard<epicsMutex> G(m_userValueMutex);
int32_t& countValue = (*siter)->getUserValue();
skip = !isPowerOfTwo(countValue);
if (countValue >= MAX_COUNT_VALUE)
countValue = MAX_FALLBACK_COUNT_VALUE;
else
countValue++;
m_userValueMutex.unlock();
if (countValue >= MAX_COUNT_VALUE)
countValue = MAX_FALLBACK_COUNT_VALUE;
else
countValue++;
}
// back-off
if (skip)