epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

workaround for Tornado II compiler bug

Browse Source
This commit is contained in:
Jeff Hill
2003-03-11 17:39:44 +00:00
parent 2353e483c7
commit 7c4d4479ec
3 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cas/generic/casChannelI.cc
View File

@@ -19,10 +19,17 @@
#include "casChannelI.h"
#include "casAsyncIOI.h"
casChannelI::casChannelI ( casChannel & chanIn, const casCtx & ctx ) :
chanIntfForPV ( *ctx.getClient() ), pv ( *ctx.getPV() ),
chan ( chanIn ), cid ( ctx.getMsg()->m_cid ),
serverDeletePending ( false ), accessRightsEvPending ( false )
casChannelI::casChannelI (
casCoreClient & clientIn,
casChannel & chanIn,
casPVI & pvIn,
ca_uint32_t cidIn ) :
chanIntfForPV ( clientIn ),
pv ( pvIn ),
chan ( chanIn ),
cid ( cidIn ),
serverDeletePending ( false ),
accessRightsEvPending ( false )
{
}

3
src/cas/generic/casChannelI.h
View File

@@ -31,7 +31,8 @@ class casChannelI : public tsDLNode < casChannelI >,
public chronIntIdRes < casChannelI >, public casEvent,
private chanIntfForPV {
public:
casChannelI ( casChannel & chan, const casCtx & ctx );
casChannelI ( casCoreClient & clientIn, casChannel & chanIn,
casPVI & pvIn, ca_uint32_t cidIn );
~casChannelI ();
void casChannelDestroyNotify ( bool immediateUninstall );
const caResId getCID ();

58
src/cas/generic/casStrmClient.cc
View File

@@ -1235,21 +1235,36 @@ caStatus casStrmClient::claimChannelAction (
//
caStatus casStrmClient::createChanResponse (
epicsGuard < casClientMutex > & guard,
const caHdrLargeArray & hdr, const pvAttachReturn & pvar )
const caHdrLargeArray & hdr,
const pvAttachReturn & pvar )
{
if ( pvar.getStatus() != S_cas_success ) {
return this->channelCreateFailedResp ( guard, hdr, pvar.getStatus() );
return this->channelCreateFailedResp ( guard,
hdr, pvar.getStatus() );
}
if ( ! pvar.getPV()->pPVI ) {
pvar.getPV()->pPVI = new ( std::nothrow ) casPVI ( *pvar.getPV() );
// @#$!* Tornado 2 Cygnus GNU compiler bugs
# if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )
pvar.getPV()->pPVI = new ( std::nothrow )
casPVI ( *pvar.getPV() );
# else
try {
pvar.getPV()->pPVI = new
casPVI ( *pvar.getPV() );
}
catch ( ... ) {
pvar.getPV()->pPVI = 0;
}
# endif
if ( ! pvar.getPV()->pPVI ) {
pvar.getPV()->destroyRequest ();
return this->channelCreateFailedResp ( guard, hdr, S_casApp_pvNotFound );
}
}
unsigned nativeTypeDBR;
unsigned nativeTypeDBR;
caStatus status = pvar.getPV()->pPVI->bestDBRType ( nativeTypeDBR );
if ( status ) {
pvar.getPV()->pPVI->deleteSignal();
@@ -1257,7 +1272,7 @@ caStatus casStrmClient::createChanResponse (
return this->channelCreateFailedResp ( guard, hdr, status );
}
//
//
// attach the PV to this server
//
status = pvar.getPV()->pPVI->attachToServer ( this->getCAS() );
@@ -1270,22 +1285,35 @@ caStatus casStrmClient::createChanResponse (
// create server tool XXX derived from casChannel
// (use temp context because this can be called asynchronously)
//
casCtx tmpCtx;
tmpCtx.setClient ( this );
tmpCtx.setPV ( pvar.getPV()->pPVI );
tmpCtx.setMsg ( hdr, 0 );
casChannel * pChan = pvar.getPV()->pPVI->createChannel (
tmpCtx, this->pUserName, this->pHostName );
this->ctx, this->pUserName, this->pHostName );
if ( ! pChan ) {
return this->channelCreateFailedResp ( guard, hdr, S_cas_noMemory );
return this->channelCreateFailedResp (
guard, hdr, S_cas_noMemory );
}
if ( ! pChan->pChanI ) {
pChan->pChanI = new ( std::nothrow ) casChannelI ( *pChan, tmpCtx );
// @#$!* Tornado 2 Cygnus GNU compiler bugs
# if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )
pChan->pChanI = new ( std::nothrow )
casChannelI ( * this, *pChan,
* pvar.getPV()->pPVI, hdr.m_cid );
# else
try {
pChan->pChanI = new
casChannelI ( * this, *pChan,
* pvar.getPV()->pPVI, hdr.m_cid );
}
catch ( ... ) {
pChan->pChanI = 0;
}
# endif
if ( ! pChan->pChanI ) {
pChan->destroyRequest ();
pvar.getPV()->pPVI->deleteSignal ();
return this->channelCreateFailedResp ( guard, hdr, S_cas_noMemory );
pChan->getPV()->pPVI->deleteSignal ();
return this->channelCreateFailedResp (
guard, hdr, S_cas_noMemory );
}
}
@@ -1329,7 +1357,7 @@ caStatus casStrmClient::createChanResponse (
status = enumPostponedCreateChanResponse (
guard, *pChan->pChanI, hdr, nativeTypeDBR );
}
if ( status != S_cas_success ) {
delete ctx.getChannel();
}