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

added try catch block to pend io

Browse Source
This commit is contained in:
Jeff Hill
2001-08-09 00:54:08 +00:00
parent 331b9b3d8b
commit 6c2303a958
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ca/access.cpp
View File

@@ -623,7 +623,7 @@ extern "C" int epicsShareAPI ca_pend ( ca_real timeout, int early )
/*
* ca_pend_event ()
*/
extern "C" int epicsShareAPI ca_pend_event (ca_real timeout)
extern "C" int epicsShareAPI ca_pend_event ( ca_real timeout )
{
oldCAC *pcac;
int status = fetchClientContext ( &pcac );
@@ -649,7 +649,7 @@ extern "C" int epicsShareAPI ca_pend_event (ca_real timeout)
/*
* ca_pend_io ()
*/
extern "C" int epicsShareAPI ca_pend_io (ca_real timeout)
extern "C" int epicsShareAPI ca_pend_io ( ca_real timeout )
{
oldCAC *pcac;
int status = fetchClientContext ( &pcac );
@@ -657,13 +657,18 @@ extern "C" int epicsShareAPI ca_pend_io (ca_real timeout)
return status;
}
// preserve past odd ball behavior of waiting forever when
// the delay is zero
if ( timeout == 0.0 ) {
return pcac->pendIO ( DBL_MAX );
}
try {
// preserve past odd ball behavior of waiting forever when
// the delay is zero
if ( timeout == 0.0 ) {
return pcac->pendIO ( DBL_MAX );
}
return pcac->pendIO ( timeout );
return pcac->pendIO ( timeout );
}
catch ( ... ) {
return ECA_INTERNAL;
}
}
/*