EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Improved debug message, more digits in debug timestamp.

Browse Source
This commit is contained in:
zimoch
2012-08-09 08:38:05 +00:00
parent de116c9e5a
commit caf811c23a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/StreamEpics.cc
View File

@ -39,6 +39,7 @@ extern "C" {
#include <recSup.h> #include <recSup.h>
#include <recGbl.h> #include <recGbl.h>
#include <devLib.h> #include <devLib.h>
#define epicsAlarmGLOBAL
#include <alarm.h> #include <alarm.h>
#include <callback.h> #include <callback.h>
@ -279,7 +280,7 @@ void streamEpicsPrintTimestamp(char* buffer, int size)
{ {
int tlen; int tlen;
epicsTime tm = epicsTime::getCurrent(); epicsTime tm = epicsTime::getCurrent();
tlen = tm.strftime(buffer, size, "%Y/%m/%d %H:%M:%S.%03f"); tlen = tm.strftime(buffer, size, "%Y/%m/%d %H:%M:%S.%06f");
sprintf(buffer+tlen, " %.*s", size-tlen-2, epicsThreadGetNameSelf()); sprintf(buffer+tlen, " %.*s", size-tlen-2, epicsThreadGetNameSelf());
} }
#else #else
@ -585,9 +586,9 @@ initRecord()
ioLink->value.instio.string); ioLink->value.instio.string);
return S_dev_badInitRet; return S_dev_badInitRet;
} }
memset(busparam, 0 ,80); memset(busparam, 0 ,sizeof(busparam));
for (n = 0; isspace((unsigned char)ioLink->value.instio.string[n]); n++); for (n = 0; isspace((unsigned char)ioLink->value.instio.string[n]); n++);
strncpy (busparam, ioLink->value.constantStr+n, 79); strncpy (busparam, ioLink->value.constantStr+n, sizeof(busparam)-1);
// attach to bus interface // attach to bus interface
if (!attachBus(busname, addr, busparam)) if (!attachBus(busname, addr, busparam))
@ -669,8 +670,11 @@ process()
{ {
if (status != NO_ALARM) if (status != NO_ALARM)
{ {
debug("Stream::process(%s) error status=%d\n", debug("Stream::process(%s) error status=%s (%d)\n",
name(), status); name(),
status >= 0 && status < ALARM_NSTATUS ?
epicsAlarmConditionStrings[status] : "ERROR",
status);
(void) recGblSetSevr(record, status, INVALID_ALARM); (void) recGblSetSevr(record, status, INVALID_ALARM);
return false; return false;
} }