Compare commits

...

3 Commits
2.8.3 ... 2.8.4

Author SHA1 Message Date
53ea75dc80 use macro instead of magic value 2018-09-12 09:48:55 +02:00
b1f4c2a7d9 improve debug message 2018-09-11 18:27:52 +02:00
d87e9cedd2 reset proc to 0 in case it had been 2 to trigger @init 2018-09-11 18:19:58 +02:00

View File

@ -831,7 +831,7 @@ initRecord(const char* filename, const char* protocol,
return ERROR; return ERROR;
} }
debug("Stream::initRecord %s: initialized. %s\n", debug("Stream::initRecord %s: initialized. %s\n",
name(), convert==2 ? name(), convert == DO_NOT_CONVERT ?
"convert" : "don't convert"); "convert" : "don't convert");
return convert; return convert;
} }
@ -843,6 +843,7 @@ process()
debug("Stream::process(%s)\n", name()); debug("Stream::process(%s)\n", name());
if (record->pact || record->scan == SCAN_IO_EVENT) if (record->pact || record->scan == SCAN_IO_EVENT)
{ {
record->proc = 0;
if (status != NO_ALARM) if (status != NO_ALARM)
{ {
debug("Stream::process(%s) error status=%s (%d)\n", debug("Stream::process(%s) error status=%s (%d)\n",
@ -854,7 +855,7 @@ process()
return false; return false;
} }
debug("Stream::process(%s) ready. %s\n", debug("Stream::process(%s) ready. %s\n",
name(), convert==2 ? name(), convert == DO_NOT_CONVERT ?
"convert" : "don't convert"); "convert" : "don't convert");
return true; return true;
} }
@ -870,9 +871,13 @@ process()
convert = OK; convert = OK;
if (!startProtocol(record->proc == 2 ? StreamCore::StartInit : StreamCore::StartNormal)) if (!startProtocol(record->proc == 2 ? StreamCore::StartInit : StreamCore::StartNormal))
{ {
debug("Stream::process(%s): could not start %sprotocol, status=%d\n", debug("Stream::process(%s): could not start %sprotocol, status=%s (%d)\n",
name(), record->proc==2 ? "@init " : "", status); name(), record->proc == 2 ? "@init " : "",
status >= 0 && status < ALARM_NSTATUS ?
epicsAlarmConditionStrings[status] : "ERROR",
status);
(void) recGblSetSevr(record, status ? status : UDF_ALARM, INVALID_ALARM); (void) recGblSetSevr(record, status ? status : UDF_ALARM, INVALID_ALARM);
record->proc = 0;
return false; return false;
} }
debug("Stream::process(%s): protocol started\n", name()); debug("Stream::process(%s): protocol started\n", name());