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

Integrating change by Malcolm Waters: fix for "-c -w 0" hanging forever

Browse Source
This commit is contained in:
Ralph Lange
2006-02-06 16:08:04 +00:00
parent d6b6955903
commit 85eacf584c
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/catools/caget.c
View File

@@ -14,6 +14,9 @@
*
* Author: Ralph Lange (BESSY)
*
* Modification History
* 2006/01/17 Malcolm Walters (Tessella/Diamond Light Source)
* Fixed problem with "-c -w 0" hanging forever
*/
#include <stdio.h>
@@ -208,14 +211,22 @@ int caget (pv *pvs, int nPvs, RequestT request, OutputT format,
if (request == callback) /* Also wait for callbacks */
{
double slice = caTimeout / PEND_EVENT_SLICES;
for (n = 0; n < PEND_EVENT_SLICES; n++)
if (caTimeout != 0)
{
ca_pend_event(slice);
if (nRead >= nConn) break;
double slice = caTimeout / PEND_EVENT_SLICES;
for (n = 0; n < PEND_EVENT_SLICES; n++)
{
ca_pend_event(slice);
if (nRead >= nConn) break;
}
if (nRead < nConn)
fprintf(stderr, "Read operation timed out: some PV data was not read.\n");
} else {
/* For 0 timeout keep waiting until all are done */
while (nRead < nConn) {
ca_pend_event(1.0);
}
}
if (nRead < nConn)
fprintf(stderr, "Read operation timed out: some PV data was not read.\n");
}
/* Print the data */