rename GUID -> ServerGUID

avoid ambigious name on windows/mingw
This commit is contained in:
Michael Davidsaver
2017-07-04 17:57:20 +02:00
parent 3ea8d7c71c
commit 05b6da623a
14 changed files with 28 additions and 25 deletions

View File

@ -1193,7 +1193,7 @@ class ServerContext
{
public:
virtual ~ServerContext() {};
virtual const GUID& getGUID() = 0;
virtual const ServerGUID& getGUID() = 0;
virtual const Version& getVersion() = 0;
virtual void initialize(ChannelProviderRegistryPtr const & channelProviderRegistry) = 0;
virtual void run(int32 seconds) = 0;
@ -1216,7 +1216,7 @@ ServerContextPtr startPVAServer(
where
<dl>
<dt>getGUID</dt>
<dd>Returns GUID (12-byte array).</dd>
<dd>Returns ServerGUID (12-byte array).</dd>
<dt>getVersion</dt>
<dd>Get context implementation version.</dd>
<dt>initialize</dt>

View File

@ -141,7 +141,7 @@ bool processSearchResponse(osiSockAddr const & responseFrom, ByteBuffer & receiv
return false;
epics::pvAccess::GUID guid;
epics::pvAccess::ServerGUID guid;
receiveBuffer.get(guid.value, 0, sizeof(guid.value));
/*int32 searchSequenceId = */receiveBuffer.getInt();

View File

@ -11,10 +11,13 @@ namespace pvAccess {
/**
* Globally unique ID.
*/
struct GUID {
struct ServerGUID {
char value[12];
};
// 'GUID' can be ambigious on windows/mingw
typedef ServerGUID GUID EPICS_DEPRECATED;
typedef epicsInt32 pvAccessID;
class AtomicBoolean

View File

@ -34,7 +34,7 @@ BeaconHandler::~BeaconHandler()
}
void BeaconHandler::beaconNotify(osiSockAddr* /*from*/, int8 remoteTransportRevision,
TimeStamp* timestamp, GUID const & guid, int16 sequentalID,
TimeStamp* timestamp, ServerGUID const & guid, int16 sequentalID,
int16 changeCount,
PVFieldPtr /*data*/)
{
@ -44,7 +44,7 @@ void BeaconHandler::beaconNotify(osiSockAddr* /*from*/, int8 remoteTransportRevi
}
bool BeaconHandler::updateBeacon(int8 /*remoteTransportRevision*/, TimeStamp* /*timestamp*/,
GUID const & guid, int16 /*sequentalID*/, int16 changeCount)
ServerGUID const & guid, int16 /*sequentalID*/, int16 changeCount)
{
Lock guard(_mutex);
// first beacon notification check

View File

@ -57,7 +57,7 @@ public:
void beaconNotify(osiSockAddr* from,
epics::pvData::int8 remoteTransportRevision,
epics::pvData::TimeStamp* timestamp,
GUID const &guid,
ServerGUID const &guid,
epics::pvData::int16 sequentalID,
epics::pvData::int16 changeCount,
epics::pvData::PVFieldPtr data);
@ -81,7 +81,7 @@ private:
/**
* Server GUID.
*/
GUID _serverGUID;
ServerGUID _serverGUID;
/**
* Server startup timestamp.
*/
@ -102,7 +102,7 @@ private:
*/
bool updateBeacon(epics::pvData::int8 remoteTransportRevision,
epics::pvData::TimeStamp* timestamp,
GUID const &guid,
ServerGUID const &guid,
epics::pvData::int16 sequentalID,
epics::pvData::int16 changeCount);
/**

View File

@ -46,7 +46,7 @@ public:
* @param serverAddress server address.
*/
// TODO make serverAddress an URI or similar
virtual void searchResponse(const GUID & guid, int8_t minorRevision, osiSockAddr* serverAddress) = 0;
virtual void searchResponse(const ServerGUID & guid, int8_t minorRevision, osiSockAddr* serverAddress) = 0;
};
class ChannelSearchManager {
@ -85,7 +85,7 @@ public:
* @param minorRevision server minor PVA revision.
* @param serverAddress server address.
*/
virtual void searchResponse(const GUID & guid, pvAccessID cid, int32_t seqNo, int8_t minorRevision, osiSockAddr* serverAddress) = 0;
virtual void searchResponse(const ServerGUID & guid, pvAccessID cid, int32_t seqNo, int8_t minorRevision, osiSockAddr* serverAddress) = 0;
/**
* New server detected.

View File

@ -96,7 +96,7 @@ public:
* @param minorRevision server minor PVA revision.
* @param serverAddress server address.
*/
void searchResponse(const GUID & guid, pvAccessID cid, int32_t seqNo, int8_t minorRevision, osiSockAddr* serverAddress);
void searchResponse(const ServerGUID & guid, pvAccessID cid, int32_t seqNo, int8_t minorRevision, osiSockAddr* serverAddress);
/**
* New server detected.
* Boost searching of all channels.

View File

@ -139,7 +139,7 @@ void SimpleChannelSearchManagerImpl::unregisterSearchInstance(SearchInstance::sh
m_channels.erase(id);
}
void SimpleChannelSearchManagerImpl::searchResponse(const GUID & guid, pvAccessID cid, int32_t /*seqNo*/, int8_t minorRevision, osiSockAddr* serverAddress)
void SimpleChannelSearchManagerImpl::searchResponse(const ServerGUID & guid, pvAccessID cid, int32_t /*seqNo*/, int8_t minorRevision, osiSockAddr* serverAddress)
{
Lock guard(m_channelMutex);
m_channels_t::iterator channelsIter = m_channels.find(cid);

View File

@ -2586,7 +2586,7 @@ public:
transport->ensureData(12+4+16+2);
GUID guid;
ServerGUID guid;
payloadBuffer->get(guid.value, 0, sizeof(guid.value));
int32 searchSequenceId = payloadBuffer->getInt();
@ -2737,7 +2737,7 @@ public:
transport->ensureData(12+2+2+16+2);
GUID guid;
ServerGUID guid;
payloadBuffer->get(guid.value, 0, sizeof(guid.value));
/*int8 qosCode =*/ payloadBuffer->getByte();
@ -3247,7 +3247,7 @@ private:
/**
* @brief Server GUID.
*/
GUID m_guid;
ServerGUID m_guid;
/**
* Constructor.
@ -3677,7 +3677,7 @@ public:
m_addressIndex = m_addresses->size()*STATIC_SEARCH_MAX_MULTIPLIER;
// NOTE: calls channelConnectFailed() on failure
static GUID guid = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
static ServerGUID guid = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
searchResponse(guid, PVA_PROTOCOL_REVISION, &((*m_addresses)[ix]));
}
@ -3685,7 +3685,7 @@ public:
// noop
}
virtual void searchResponse(const GUID & guid, int8 minorRevision, osiSockAddr* serverAddress) OVERRIDE FINAL {
virtual void searchResponse(const ServerGUID & guid, int8 minorRevision, osiSockAddr* serverAddress) OVERRIDE FINAL {
Lock guard(m_channelMutex);
Transport::shared_pointer transport = m_transport;
if (transport.get())

View File

@ -110,7 +110,7 @@ private:
/**
* Server GUID.
*/
GUID _guid;
ServerGUID _guid;
/**
* Fast (at startup) beacon period (in sec).

View File

@ -174,7 +174,7 @@ public:
void timerStopped();
private:
GUID _guid;
ServerGUID _guid;
std::string _name;
epics::pvData::int32 _searchSequenceId;
epics::pvData::int32 _cid;

View File

@ -38,7 +38,7 @@ public:
* Returns GUID (12-byte array).
* @return GUID.
*/
virtual const GUID& getGUID() = 0;
virtual const ServerGUID& getGUID() = 0;
/**
* Get context implementation version.

View File

@ -25,7 +25,7 @@ public:
virtual ~ServerContextImpl();
//**************** derived from ServerContext ****************//
const GUID& getGUID() OVERRIDE FINAL;
const ServerGUID& getGUID() OVERRIDE FINAL;
const Version& getVersion() OVERRIDE FINAL;
void initialize();
void run(epics::pvData::uint32 seconds) OVERRIDE FINAL;
@ -129,7 +129,7 @@ private:
/**
* Server GUID.
*/
GUID _guid;
ServerGUID _guid;
/**
* A space-separated list of broadcast address which to send beacons.
@ -232,7 +232,7 @@ private:
BeaconServerStatusProvider::shared_pointer _beaconServerStatusProvider;
/**
* Generate GUID.
* Generate ServerGUID.
*/
void generateGUID();

View File

@ -65,7 +65,7 @@ ServerContextImpl::~ServerContextImpl()
}
}
const GUID& ServerContextImpl::getGUID()
const ServerGUID& ServerContextImpl::getGUID()
{
return _guid;
}