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

merge

Browse Source
This commit is contained in:
Matej Sekoranja
2011-10-04 14:54:07 +02:00
parent e21938968c 1ca14cad7f
commit dc41d7569d
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pvAccessApp/remote/channelSearchManager.cpp
View File

@@ -30,9 +30,10 @@ void BaseSearchInstance::addAndSetListOwnership(SearchInstance::List* newOwner,
{
if(ownerMutex == NULL) THROW_BASE_EXCEPTION("Null owner mutex");
_ownerMutex = ownerMutex;
Lock ownerGuard(*_ownerMutex);
Lock guard(_mutex);
Lock ownerGuard(*ownerMutex);
_ownerMutex = ownerMutex;
Lock guard(_mutex);
newOwner->push_back(this);
//if (_owner == NULL) this->acquire(); // new owner
_owner = newOwner;
@@ -41,23 +42,29 @@ void BaseSearchInstance::addAndSetListOwnership(SearchInstance::List* newOwner,
void BaseSearchInstance::removeAndUnsetListOwnership()
{
if(_owner == NULL) return;
Mutex * localOm;
SearchInstance::List* localOwner;
BaseSearchInstance *_this;
{
Lock guard(_mutex);
if(_owner == NULL) return;
if(_ownerMutex == NULL) THROW_BASE_EXCEPTION("Null owner mutex");
Lock ownerGuard(*_ownerMutex);
Lock guard(_mutex);
if(_owner != NULL)
{
//this->release();
// TODO !!!
for (SearchInstance::List::iterator iter = _owner->begin(); iter != _owner->end(); iter++)
if (*iter == this)
{
_owner->erase(iter);
break;
}
_owner = NULL;
}
if(_ownerMutex == NULL) THROW_BASE_EXCEPTION("Null owner mutex");
localOm=_ownerMutex;
localOwner=_owner;
_owner = NULL;
_ownerMutex = NULL;
_this=this;
}
Lock ownerGuard(*localOm);
for (SearchInstance::List::iterator iter = localOwner->begin(); iter != localOwner->end(); iter++) {
if (*iter == _this)
{
localOwner->erase(iter);
break;
}
}
}
int32 BaseSearchInstance::getOwnerIndex()