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

OK -> Ok

Browse Source
This commit is contained in:
Matej Sekoranja
2012-03-29 08:20:48 +02:00
parent c31a4ed7ea
commit 3a68046c7c
9 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pvAccessApp/remoteClient/clientContextImpl.cpp
View File

@@ -1871,11 +1871,11 @@ namespace epics {
}
Status start() {
return Status::OK;
return Status::Ok;
}
Status stop() {
return Status::OK;
return Status::Ok;
}
void destroy() {
@@ -1945,11 +1945,11 @@ namespace epics {
Status start() {
Lock guard(m_mutex);
m_gotMonitor = false;
return Status::OK;
return Status::Ok;
}
Status stop() {
return Status::OK;
return Status::Ok;
}
void destroy() {
@@ -2062,11 +2062,11 @@ namespace epics {
m_gotMonitor = false;
m_monitorElementImpl->m_changedBitSet->clear();
m_monitorElementImpl->m_overrunBitSet->clear();
return Status::OK;
return Status::Ok;
}
Status stop() {
return Status::OK;
return Status::Ok;
}
void destroy() {
@@ -2271,7 +2271,7 @@ namespace epics {
}
else
{
normalResponse(transport, version, payloadBuffer, qos, Status::OK);
normalResponse(transport, version, payloadBuffer, qos, Status::Ok);
}
}
@@ -2296,7 +2296,7 @@ namespace epics {
TransportSender::shared_pointer thisSender = shared_from_this();
m_channel->checkAndGetTransport()->enqueueSendRequest(thisSender);
m_started = true;
return Status::OK;
return Status::Ok;
} catch (std::runtime_error &rte) {
stopRequest();
return BaseRequestImpl::channelNotConnected;
@@ -2323,7 +2323,7 @@ namespace epics {
TransportSender::shared_pointer thisSender = shared_from_this();
m_channel->checkAndGetTransport()->enqueueSendRequest(thisSender);
m_started = false;
return Status::OK;
return Status::Ok;
} catch (std::runtime_error &rte) {
stopRequest();
return BaseRequestImpl::channelNotConnected;
@@ -2871,7 +2871,7 @@ namespace epics {
auto_ptr<InetAddrVector> addresses;
Channel::shared_pointer channel = m_context->createChannelInternal(channelName, channelRequester, priority, addresses);
if (channel.get())
channelRequester->channelCreated(Status::OK, channel);
channelRequester->channelCreated(Status::Ok, channel);
return channel;
// NOTE it's up to internal code to respond w/ error to requester and return 0 in case of errors

26
testApp/client/MockClientImpl.cpp
View File

@@ -59,7 +59,7 @@ class MockChannelProcess : public ChannelProcess
m_valueField = static_cast<PVScalar*>(field);
// TODO pvRequest
m_channelProcessRequester->channelProcessConnect(Status::OK, this);
m_channelProcessRequester->channelProcessConnect(Status::Ok, this);
}
virtual void process(bool lastRequest)
@@ -135,7 +135,7 @@ class MockChannelProcess : public ChannelProcess
break;
}
m_channelProcessRequester->processDone(Status::OK);
m_channelProcessRequester->processDone(Status::Ok);
if (lastRequest)
destroy();
@@ -177,12 +177,12 @@ class MockChannelGet : public ChannelGet
PVDATA_REFCOUNT_MONITOR_CONSTRUCT(mockChannelGet);
// TODO pvRequest
m_channelGetRequester->channelGetConnect(Status::OK, this, m_pvStructure, m_bitSet);
m_channelGetRequester->channelGetConnect(Status::Ok, this, m_pvStructure, m_bitSet);
}
virtual void get(bool lastRequest)
{
m_channelGetRequester->getDone(Status::OK);
m_channelGetRequester->getDone(Status::Ok);
if (m_first)
{
m_first = false;
@@ -232,19 +232,19 @@ class MockChannelPut : public ChannelPut
PVDATA_REFCOUNT_MONITOR_CONSTRUCT(mockChannelPut);
// TODO pvRequest
m_channelPutRequester->channelPutConnect(Status::OK, this, m_pvStructure, m_bitSet);
m_channelPutRequester->channelPutConnect(Status::Ok, this, m_pvStructure, m_bitSet);
}
virtual void put(bool lastRequest)
{
m_channelPutRequester->putDone(Status::OK);
m_channelPutRequester->putDone(Status::Ok);
if (lastRequest)
destroy();
}
virtual void get()
{
m_channelPutRequester->getDone(Status::OK);
m_channelPutRequester->getDone(Status::Ok);
}
virtual void destroy()
@@ -294,7 +294,7 @@ class MockMonitor : public Monitor, public MonitorElement
m_changedBitSet->set(0);
// TODO pvRequest
m_monitorRequester->monitorConnect(Status::OK, this, m_pvStructure->getStructure());
m_monitorRequester->monitorConnect(Status::Ok, this, m_pvStructure->getStructure());
}
virtual Status start()
@@ -302,12 +302,12 @@ class MockMonitor : public Monitor, public MonitorElement
// fist monitor
m_monitorRequester->monitorEvent(this);
return Status::OK;
return Status::Ok;
}
virtual Status stop()
{
return Status::OK;
return Status::Ok;
}
virtual MonitorElement* poll()
@@ -463,7 +463,7 @@ class MockChannel : public Channel {
virtual void getField(GetFieldRequester *requester,epics::pvData::String subField)
{
requester->getDone(Status::OK,m_pvStructure->getSubField(subField)->getField());
requester->getDone(Status::Ok,m_pvStructure->getSubField(subField)->getField());
}
virtual ChannelProcess* createChannelProcess(
@@ -592,7 +592,7 @@ class MockChannelProvider : public ChannelProvider {
epics::pvData::String channelName,
ChannelFindRequester *channelFindRequester)
{
channelFindRequester->channelFindResult(Status::OK, m_mockChannelFind, true);
channelFindRequester->channelFindResult(Status::Ok, m_mockChannelFind, true);
return m_mockChannelFind;
}
@@ -613,7 +613,7 @@ class MockChannelProvider : public ChannelProvider {
if (address == "local")
{
Channel* channel = new MockChannel(this, channelRequester, channelName, address);
channelRequester->channelCreated(Status::OK, channel);
channelRequester->channelCreated(Status::Ok, channel);
return channel;
}
else

10
testApp/remote/eget.cpp
View File

@@ -439,7 +439,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel get create: " << status.toString() << std::endl;
}
@@ -465,7 +465,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel get: " << status.toString() << std::endl;
}
@@ -539,7 +539,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel RPC create: " << status.toString() << std::endl;
}
@@ -563,7 +563,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel RPC: " << status.toString() << std::endl;
}
@@ -642,7 +642,7 @@ public:
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
}

6
testApp/remote/pvget.cpp
View File

@@ -389,7 +389,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel get create: " << status.toString() << std::endl;
}
@@ -415,7 +415,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel get: " << status.toString() << std::endl;
}
@@ -483,7 +483,7 @@ public:
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
}

8
testApp/remote/pvput.cpp
View File

@@ -388,7 +388,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel put create: " << status.toString() << std::endl;
}
@@ -412,7 +412,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel get: " << status.toString() << std::endl;
}
@@ -441,7 +441,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel put: " << status.toString() << std::endl;
}
@@ -493,7 +493,7 @@ public:
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
}

2
testApp/remote/pvrpc.cpp
View File

@@ -104,7 +104,7 @@ public:
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
}

6
testApp/remote/testGetPerformance.cpp
View File

@@ -75,7 +75,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel get create: " << status.toString() << std::endl;
}
@@ -100,7 +100,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << m_channelName << "] channel get: " << status.toString() << std::endl;
}
@@ -168,7 +168,7 @@ public:
if (status.isSuccess())
{
// show warning
if (!status.isOK())
if (!status.isOk())
{
std::cout << "[" << channel->getChannelName() << "] channel create: " << status.toString() << std::endl;
}

46
testApp/remote/testServer.cpp
View File

@@ -60,7 +60,7 @@ class MockChannelProcess :
ChannelProcess::shared_pointer thisPtr(new MockChannelProcess(channelProcessRequester, pvStructure, pvRequest));
// TODO pvRequest
channelProcessRequester->channelProcessConnect(Status::OK, thisPtr);
channelProcessRequester->channelProcessConnect(Status::Ok, thisPtr);
return thisPtr;
}
@@ -144,7 +144,7 @@ class MockChannelProcess :
break;
}
m_channelProcessRequester->processDone(Status::OK);
m_channelProcessRequester->processDone(Status::Ok);
if (lastRequest)
destroy();
@@ -193,7 +193,7 @@ class MockChannelGet : public ChannelGet
{
ChannelGet::shared_pointer thisPtr(new MockChannelGet(channelGetRequester, pvStructure, pvRequest));
// TODO pvRequest
channelGetRequester->channelGetConnect(Status::OK, thisPtr, pvStructure, static_cast<MockChannelGet*>(thisPtr.get())->m_bitSet);
channelGetRequester->channelGetConnect(Status::Ok, thisPtr, pvStructure, static_cast<MockChannelGet*>(thisPtr.get())->m_bitSet);
return thisPtr;
}
@@ -205,7 +205,7 @@ class MockChannelGet : public ChannelGet
virtual void get(bool lastRequest)
{
m_channelGetRequester->getDone(Status::OK);
m_channelGetRequester->getDone(Status::Ok);
if (m_first)
{
m_first = false;
@@ -256,7 +256,7 @@ class MockChannelPut : public ChannelPut
{
ChannelPut::shared_pointer thisPtr(new MockChannelPut(channelPutRequester, pvStructure, pvRequest));
// TODO pvRequest
channelPutRequester->channelPutConnect(Status::OK, thisPtr, pvStructure, static_cast<MockChannelPut*>(thisPtr.get())->m_bitSet);
channelPutRequester->channelPutConnect(Status::Ok, thisPtr, pvStructure, static_cast<MockChannelPut*>(thisPtr.get())->m_bitSet);
return thisPtr;
}
@@ -269,14 +269,14 @@ class MockChannelPut : public ChannelPut
virtual void put(bool lastRequest)
{
m_channelPutRequester->putDone(Status::OK);
m_channelPutRequester->putDone(Status::Ok);
if (lastRequest)
destroy();
}
virtual void get()
{
m_channelPutRequester->getDone(Status::OK);
m_channelPutRequester->getDone(Status::Ok);
}
virtual void destroy()
@@ -317,7 +317,7 @@ class MockChannelPutGet : public ChannelPutGet
{
ChannelPutGet::shared_pointer thisPtr(new MockChannelPutGet(channelPutGetRequester, pvStructure, pvRequest));
// TODO pvRequest
channelPutGetRequester->channelPutGetConnect(Status::OK, thisPtr, pvStructure, pvStructure);
channelPutGetRequester->channelPutGetConnect(Status::Ok, thisPtr, pvStructure, pvStructure);
return thisPtr;
}
@@ -329,19 +329,19 @@ class MockChannelPutGet : public ChannelPutGet
virtual void putGet(bool lastRequest)
{
m_channelPutGetRequester->putGetDone(Status::OK);
m_channelPutGetRequester->putGetDone(Status::Ok);
if (lastRequest)
destroy();
}
virtual void getGet()
{
m_channelPutGetRequester->getGetDone(Status::OK);
m_channelPutGetRequester->getGetDone(Status::Ok);
}
virtual void getPut()
{
m_channelPutGetRequester->getPutDone(Status::OK);
m_channelPutGetRequester->getPutDone(Status::Ok);
}
virtual void destroy()
@@ -384,7 +384,7 @@ class MockChannelRPC : public ChannelRPC
{
ChannelRPC::shared_pointer thisPtr(new MockChannelRPC(channelRPCRequester, pvStructure, pvRequest));
// TODO pvRequest
channelRPCRequester->channelRPCConnect(Status::OK, thisPtr);
channelRPCRequester->channelRPCConnect(Status::Ok, thisPtr);
return thisPtr;
}
@@ -398,7 +398,7 @@ class MockChannelRPC : public ChannelRPC
std::string s;
pvArgument->toString(&s);
std::cout << "RPC" << std::endl << s << std::endl;
m_channelRPCRequester->requestDone(Status::OK, m_pvStructure);
m_channelRPCRequester->requestDone(Status::Ok, m_pvStructure);
if (lastRequest)
destroy();
}
@@ -449,7 +449,7 @@ class MockChannelArray : public ChannelArray
ChannelArray::shared_pointer thisPtr(new MockChannelArray(channelArrayRequester, pvStructure, pvRequest));
// TODO pvRequest
channelArrayRequester->channelArrayConnect(Status::OK, thisPtr, static_cast<MockChannelArray*>(thisPtr.get())->m_pvArray);
channelArrayRequester->channelArrayConnect(Status::Ok, thisPtr, static_cast<MockChannelArray*>(thisPtr.get())->m_pvArray);
return thisPtr;
}
@@ -462,7 +462,7 @@ class MockChannelArray : public ChannelArray
virtual void putArray(bool lastRequest, int offset, int count)
{
// TODO offset, count
m_channelArrayRequester->putArrayDone(Status::OK);
m_channelArrayRequester->putArrayDone(Status::Ok);
if (lastRequest)
destroy();
}
@@ -470,7 +470,7 @@ class MockChannelArray : public ChannelArray
virtual void getArray(bool lastRequest, int offset, int count)
{
// TODO offset, count
m_channelArrayRequester->getArrayDone(Status::OK);
m_channelArrayRequester->getArrayDone(Status::Ok);
if (lastRequest)
destroy();
}
@@ -478,7 +478,7 @@ class MockChannelArray : public ChannelArray
virtual void setLength(bool lastRequest, int length, int capacity)
{
// TODO offset, capacity
m_channelArrayRequester->setLengthDone(Status::OK);
m_channelArrayRequester->setLengthDone(Status::Ok);
if (lastRequest)
destroy();
}
@@ -540,7 +540,7 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
// TODO pvRequest
StructureConstPtr structurePtr = static_cast<MockMonitor*>(thisPtr.get())->m_pvStructure->getStructure();
monitorRequester->monitorConnect(Status::OK, thisPtr, structurePtr);
monitorRequester->monitorConnect(Status::Ok, thisPtr, structurePtr);
return thisPtr;
}
@@ -556,12 +556,12 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
Monitor::shared_pointer thisPtr = shared_from_this();
m_monitorRequester->monitorEvent(thisPtr);
return Status::OK;
return Status::Ok;
}
virtual Status stop()
{
return Status::OK;
return Status::Ok;
}
virtual MonitorElement::shared_pointer const & poll()
@@ -782,7 +782,7 @@ class MockChannel : public Channel {
return;
}
FieldConstPtr fieldPtr = pvField->getField();
requester->getDone(Status::OK, fieldPtr);
requester->getDone(Status::Ok, fieldPtr);
}
virtual ChannelProcess::shared_pointer createChannelProcess(
@@ -920,7 +920,7 @@ class MockServerChannelProvider : public ChannelProvider,
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
// channel always exists
channelFindRequester->channelFindResult(Status::OK, m_mockChannelFind, true);
channelFindRequester->channelFindResult(Status::Ok, m_mockChannelFind, true);
return m_mockChannelFind;
}
@@ -942,7 +942,7 @@ class MockServerChannelProvider : public ChannelProvider,
{
ChannelProvider::shared_pointer chProviderPtr = shared_from_this();
Channel::shared_pointer channel = MockChannel::create(chProviderPtr, channelRequester, channelName, address);
channelRequester->channelCreated(Status::OK, channel);
channelRequester->channelCreated(Status::Ok, channel);
return channel;
}
else

4
testApp/remote/testServerContext.cpp
View File

@@ -21,7 +21,7 @@ public:
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
ChannelFind::shared_pointer nullCF;
channelFindRequester->channelFindResult(Status::OK, nullCF, false);
channelFindRequester->channelFindResult(Status::Ok, nullCF, false);
return nullCF;
}
@@ -39,7 +39,7 @@ public:
short priority, epics::pvData::String address)
{
Channel::shared_pointer nullC;
channelRequester->channelCreated(Status::OK, nullC);
channelRequester->channelCreated(Status::Ok, nullC);
return nullC;
}