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

fix for mantis 358

Browse Source
This commit is contained in:
Jeff Hill
2009-08-03 22:09:52 +00:00
parent efdee3c31a
commit e3a61ce4e4
9 changed files with 87 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cas/generic/casChannel.cc
+5
View File
@@ -90,6 +90,11 @@ caStatus casChannel::write ( const casCtx & ctx, const gdd & value )
return ctx.getPV()->write ( ctx, value );
}
caStatus casChannel::writeNotify ( const casCtx & ctx, const gdd & value )
{
return ctx.getPV()->writeNotify ( ctx, value );
}
void casChannel::show ( unsigned level ) const
{
if ( level > 2u ) {
src/cas/generic/casChannelI.cc
+11
View File
@@ -101,6 +101,17 @@ caStatus casChannelI::write ( const casCtx & ctx, const gdd & value )
return status;
}
caStatus casChannelI::writeNotify ( const casCtx & ctx, const gdd & value )
{
caStatus status = this->chan.beginTransaction ();
if ( status != S_casApp_success ) {
return status;
}
status = this->chan.writeNotify ( ctx, value );
this->chan.endTransaction ();
return status;
}
void casChannelI::postDestroyEvent ()
{
if ( ! this->serverDeletePending ) {
src/cas/generic/casChannelI.h
+1
View File
@@ -54,6 +54,7 @@ public:
bool confirmationRequested () const;
caStatus read ( const casCtx & ctx, gdd & prototype );
caStatus write ( const casCtx & ctx, const gdd & value );
caStatus writeNotify ( const casCtx & ctx, const gdd & value );
void show ( unsigned level ) const;
private:
chanIntfForPV privateForPV;
src/cas/generic/casPV.cc
+12
View File
@@ -111,6 +111,18 @@ caStatus casPV::write (const casCtx &, const gdd &)
return S_casApp_noSupport;
}
//
// casPV::writeNotify()
//
caStatus casPV :: writeNotify (
const casCtx & ctx, const gdd & val )
{
// plumbed this way to preserve backwards
// compatibility with the old interface which
// did not include a writeNotify interface
return this->write ( ctx, val );
}
//
// casPV::bestExternalType()
//
src/cas/generic/casPVI.cc
+17
View File
@@ -464,6 +464,23 @@ caStatus casPVI::write ( const casCtx & ctx, const gdd & value )
}
}
caStatus casPVI::writeNotify ( const casCtx & ctx, const gdd & value )
{
epicsGuard < epicsMutex > guard ( this->mutex );
if ( this->pPV ) {
caStatus status = this->pPV->beginTransaction ();
if ( status != S_casApp_success ) {
return status;
}
status = this->pPV->writeNotify ( ctx, value );
this->pPV->endTransaction ();
return status;
}
else {
return S_cas_disconnect;
}
}
casChannel * casPVI::createChannel ( const casCtx & ctx,
const char * const pUserName, const char * const pHostName )
{
src/cas/generic/casPVI.h
+1
View File
@@ -77,6 +77,7 @@ public:
void show ( unsigned level ) const;
caStatus read ( const casCtx & ctx, gdd & prototype );
caStatus write ( const casCtx & ctx, const gdd & value );
caStatus writeNotify ( const casCtx & ctx, const gdd & value );
casChannel * createChannel ( const casCtx & ctx,
const char * const pUserName, const char * const pHostName );
aitEnum bestExternalType () const;
src/cas/generic/casStrmClient.cc
+9 -9
View File
@@ -973,7 +973,7 @@ caStatus casStrmClient::writeAction ( epicsGuard < casClientMutex > & guard )
//
// initiate the write operation
//
status = this->write ();
status = this->write ( & casChannelI :: write );
if ( status == S_casApp_success || status == S_casApp_asyncCompletion ) {
status = S_cas_success;
}
@@ -1061,7 +1061,7 @@ caStatus casStrmClient::writeNotifyAction (
//
// initiate the write operation
//
status = this->write();
status = this->write ( & casChannelI :: writeNotify );
if (status == S_casApp_asyncCompletion) {
status = S_cas_success;
}
@@ -2023,7 +2023,7 @@ caStatus casStrmClient::accessRightsResponse (
//
// casStrmClient::write()
//
caStatus casStrmClient::write()
caStatus casStrmClient :: write ( PWriteMethod pWriteMethod )
{
const caHdrLargeArray *pHdr = this->ctx.getMsg();
caStatus status;
@@ -2054,10 +2054,10 @@ caStatus casStrmClient::write()
// lumped in with arrays
//
if ( pHdr->m_count > 1u ) {
status = this->writeArrayData ();
status = this->writeArrayData ( pWriteMethod );
}
else {
status = this->writeScalarData ();
status = this->writeScalarData ( pWriteMethod );
}
//
@@ -2089,7 +2089,7 @@ caStatus casStrmClient::write()
//
// casStrmClient::writeScalarData()
//
caStatus casStrmClient::writeScalarData ()
caStatus casStrmClient :: writeScalarData ( PWriteMethod pWriteMethod )
{
const caHdrLargeArray * pHdr = this->ctx.getMsg ();
@@ -2147,7 +2147,7 @@ caStatus casStrmClient::writeScalarData ()
//
// call the server tool's virtual function
//
status = this->ctx.getChannel()->write ( this->ctx, *pDD );
status = ( this->ctx.getChannel()->*pWriteMethod ) ( this->ctx, *pDD );
}
//
@@ -2163,7 +2163,7 @@ caStatus casStrmClient::writeScalarData ()
//
// casStrmClient::writeArrayData()
//
caStatus casStrmClient::writeArrayData()
caStatus casStrmClient :: writeArrayData ( PWriteMethod pWriteMethod )
{
const caHdrLargeArray *pHdr = this->ctx.getMsg ();
@@ -2246,7 +2246,7 @@ caStatus casStrmClient::writeArrayData()
//
// call the server tool's virtual function
//
status = this->ctx.getChannel()->write ( this->ctx, *pDD );
status = ( this->ctx.getChannel()->*pWriteMethod ) ( this->ctx, *pDD );
}
else {
status = S_cas_noConvert;
src/cas/generic/casStrmClient.h
+6 -5
View File
@@ -142,12 +142,13 @@ private:
caStatus accessRightsResponse (
epicsGuard < casClientMutex > &, casChannelI * pciu );
caStatus read ( const gdd * & pDesc );
caStatus write ();
caStatus writeArrayData();
caStatus writeScalarData();
caStatus writeString();
typedef caStatus ( casChannelI :: * PWriteMethod ) (
const casCtx &, const gdd & );
caStatus read ( const gdd * & pDesc );
caStatus write ( PWriteMethod );
caStatus writeArrayData( PWriteMethod );
caStatus writeScalarData( PWriteMethod );
outBufClient::flushCondition xSend ( char * pBuf, bufSizeT nBytesToSend,
bufSizeT & nBytesSent );
src/cas/generic/casdef.h
+25 -2
View File
@@ -392,16 +392,31 @@ public:
// asynchronous IO operation (read or write) completes
// against the PV.
//
// NOTE:
// NOTES:
// o The incoming GDD with application type "value" is always
// converted to the PV.bestExternalType() primitive type.
// o The time stamp in the incoming GDD is set to the time that
// the last message was received from the client.
// o Currently, no container type GDD's are passed here and
// the application type is always "value". This may change.
// o The write interface is called when the server receives
// ca_put request and the writeNotify interface is called
// when the server receives ca_put_callback request.
// o A writeNotify request is considered complete and therefore
// ready for asynchronous completion notification when any
// action that it initiates, and any cascaded actions, complete.
// o In an IOC context intermediate write requets can be discarded
// as long as the final writeRequest is always executed. In an
// IOC context intermediate writeNotify requests are never discarded.
// o If the service does not implement writeNotify then
// the base implementation of casPV :: writeNotify calls
// casPV :: write thereby preserving backwards compatibility
// with the original interface which included a virtual write
// method but not a virtual writeNotify method.
//
epicsShareFunc virtual caStatus write (const casCtx &ctx, const gdd &value);
epicsShareFunc virtual caStatus writeNotify (const casCtx &ctx, const gdd &value);
//
// chCreate() is called each time that a PV is attached to
// by a client. The server tool may choose not to
@@ -600,6 +615,14 @@ public:
//
epicsShareFunc virtual caStatus write (const casCtx &ctx, const gdd &value);
//
// writeNotify
//
// If this function is not provided in the derived class then casPV::writeNotify()
// is called - see casPV::writeNotify() for additional comments.
//
epicsShareFunc virtual caStatus writeNotify (const casCtx &ctx, const gdd &value);
//
// This is called for each channel in the server if
// caServer::show() is called and the level is high