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

Make * to & changes due to changes in pvData.

Browse Source
This commit is contained in:
Marty Kraimer
2011-02-18 08:20:27 -05:00
parent 50af37d7af
commit 753e6d246b
25 changed files with 205 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pvAccessApp/server/serverContext.cpp
View File

@@ -106,7 +106,7 @@ void ServerContextImpl::loadConfiguration()
void ServerContextImpl::initialize(ChannelAccess* channelAccess)
{
//TODO uncomment
/*Lock guard(&_mutex);
/*Lock guard(_mutex);
if (channelAccess == NULL)
{
THROW_BASE_EXCEPTION("non null channelAccess expected");
@@ -224,7 +224,7 @@ void ServerContextImpl::run(int32 seconds)
}
{
Lock guard(&_mutex);
Lock guard(_mutex);
if (_state == NOT_INITIALIZED)
{
@@ -260,14 +260,14 @@ void ServerContextImpl::run(int32 seconds)
}
{
Lock guard(&_mutex);
Lock guard(_mutex);
_state = SHUTDOWN;
}
}
void ServerContextImpl::shutdown()
{
Lock guard(&_mutex);
Lock guard(_mutex);
if(_state == DESTROYED)
{
THROW_BASE_EXCEPTION("Context already destroyed.");
@@ -279,7 +279,7 @@ void ServerContextImpl::shutdown()
void ServerContextImpl::destroy()
{
Lock guard(&_mutex);
Lock guard(_mutex);
if (_state == DESTROYED)
{
THROW_BASE_EXCEPTION("Context already destroyed.");
@@ -365,7 +365,7 @@ void ServerContextImpl::printInfo()
void ServerContextImpl::printInfo(ostream& str)
{
Lock guard(&_mutex);
Lock guard(_mutex);
str << "VERSION : " << getVersion().getVersionString() << endl \
<< "CHANNEL PROVIDER : " << _channelProviderName << endl \
<< "BEACON_ADDR_LIST : " << _beaconAddressList << endl \
@@ -397,13 +397,13 @@ void ServerContextImpl::setBeaconServerStatusProvider(BeaconServerStatusProvider
bool ServerContextImpl::isInitialized()
{
Lock guard(&_mutex);
Lock guard(_mutex);
return _state == INITIALIZED || _state == RUNNING || _state == SHUTDOWN;
}
bool ServerContextImpl::isDestroyed()
{
Lock guard(&_mutex);
Lock guard(_mutex);
return _state == DESTROYED;
}