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

fix redirection of strings to char arrays

Browse Source
This commit is contained in:
zimoch
2015-08-18 14:30:54 +00:00
parent 018547cdf3
commit f6f0ea9ae5
1 changed files with 73 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/StreamEpics.cc
View File

@ -993,6 +993,9 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
// -- TO DO: If SCAN is "I/O Intr" and record has not been processed, -- // -- TO DO: If SCAN is "I/O Intr" and record has not been processed, --
// -- do it now to get the latest value (only for output records?) -- // -- do it now to get the latest value (only for output records?) --
format_s fmt;
fmt.type = dbfMapping[format.type];
fmt.priv = &format;
if (fieldaddress) if (fieldaddress)
{ {
// Format like "%([record.]field)..." has requested to get value // Format like "%([record.]field)..." has requested to get value
@ -1025,7 +1028,6 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
} }
/* convert type to LONG, ENUM, DOUBLE, or STRING */ /* convert type to LONG, ENUM, DOUBLE, or STRING */
int type = dbfMapping[format.type];
long nelem = pdbaddr->no_elements; long nelem = pdbaddr->no_elements;
size_t size = nelem * typeSize[format.type]; size_t size = nelem * typeSize[format.type];
@ -1040,13 +1042,13 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
nelem, nelem,
pdbaddr->field_size, pdbaddr->field_size,
pamapdbfType[pdbaddr->field_type].strvalue); pamapdbfType[pdbaddr->field_type].strvalue);
type = DBF_CHAR; fmt.type = DBF_CHAR;
size = nelem; size = nelem;
} }
char* buffer = fieldBuffer.clear().reserve(size); char* buffer = fieldBuffer.clear().reserve(size);
if (dbGet(pdbaddr, type, buffer, if (dbGet(pdbaddr, fmt.type, buffer,
NULL, &nelem, NULL) != 0) NULL, &nelem, NULL) != 0)
{ {
error("%s: dbGet(%s.%s, %s) failed\n", error("%s: dbGet(%s.%s, %s) failed\n",
@ -1060,7 +1062,7 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
name(),nelem); name(),nelem);
/* terminate CHAR array as string */ /* terminate CHAR array as string */
if (type == DBF_CHAR) if (fmt.type == DBF_CHAR)
{ {
if (nelem >= pdbaddr->no_elements) nelem = pdbaddr->no_elements-1; if (nelem >= pdbaddr->no_elements) nelem = pdbaddr->no_elements-1;
buffer[nelem] = 0; buffer[nelem] = 0;
@ -1104,9 +1106,6 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
} }
return true; return true;
} }
format_s fmt;
fmt.type = dbfMapping[format.type];
fmt.priv = &format;
debug("Stream::formatValue(%s) format=%%%c type=%s\n", debug("Stream::formatValue(%s) format=%%%c type=%s\n",
name(), format.conv, pamapdbfType[fmt.type].strvalue); name(), format.conv, pamapdbfType[fmt.type].strvalue);
if (!writeData) if (!writeData)
@ -1132,7 +1131,10 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
char* buffer; char* buffer;
int status; int status;
const char* putfunc; const char* putfunc;
format_s fmt;
fmt.type = dbfMapping[format.type];
fmt.priv = &format;
if (fieldaddress) if (fieldaddress)
{ {
// Format like "%([record.]field)..." has requested to put value // Format like "%([record.]field)..." has requested to put value
@ -1152,8 +1154,10 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
{ {
consumed = scanValue(format, lval); consumed = scanValue(format, lval);
if (consumed >= 0) ((epicsInt32*)buffer)[nord] = lval; if (consumed >= 0) ((epicsInt32*)buffer)[nord] = lval;
debug("Stream::matchValue(%s): %s[%li] = %li\n", debug("Stream::matchValue(%s): %s.%s[%li] = %li\n",
name(), pdbaddr->precord->name, nord, lval); name(), pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name,
nord, lval);
break; break;
} }
case enum_format: case enum_format:
@ -1161,8 +1165,10 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
consumed = scanValue(format, lval); consumed = scanValue(format, lval);
if (consumed >= 0) if (consumed >= 0)
((epicsUInt16*)buffer)[nord] = (epicsUInt16)lval; ((epicsUInt16*)buffer)[nord] = (epicsUInt16)lval;
debug("Stream::matchValue(%s): %s[%li] = %li\n", debug("Stream::matchValue(%s): %s.%s[%li] = %li\n",
name(), pdbaddr->precord->name, nord, lval); name(), pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name,
nord, lval);
break; break;
} }
case double_format: case double_format:
@ -1175,18 +1181,34 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
if (consumed >= 0) if (consumed >= 0)
memcpy(((epicsFloat64*)buffer)+nord, memcpy(((epicsFloat64*)buffer)+nord,
&f64, sizeof(f64)); &f64, sizeof(f64));
debug("Stream::matchValue(%s): %s[%li] = %#g %#g\n", debug("Stream::matchValue(%s): %s.%s[%li] = %#g %#g\n",
name(), pdbaddr->precord->name, nord, dval, name(), pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name,
nord, dval,
((epicsFloat64*)buffer)[nord]); ((epicsFloat64*)buffer)[nord]);
break; break;
} }
case string_format: case string_format:
{ {
consumed = scanValue(format, if (pdbaddr->field_type == DBF_CHAR)
buffer+MAX_STRING_SIZE*nord, MAX_STRING_SIZE); {
debug("Stream::matchValue(%s): %s[%li] = \"%.*s\"\n", // string to char array
name(), pdbaddr->precord->name, nord, consumed = scanValue(format, buffer, nelem);
MAX_STRING_SIZE, buffer+MAX_STRING_SIZE*nord); debug("Stream::matchValue(%s): %s.%s = \"%.*s\"\n",
name(), pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name,
(int)consumed, buffer);
nord = nelem;
}
else
{
consumed = scanValue(format,
buffer+MAX_STRING_SIZE*nord, MAX_STRING_SIZE);
debug("Stream::matchValue(%s): %s.%s[%li] = \"%.*s\"\n",
name(), pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name,
nord, MAX_STRING_SIZE, buffer+MAX_STRING_SIZE*nord);
}
break; break;
} }
default: default:
@ -1223,15 +1245,17 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
name()); name());
return false; return false;
} }
/* convert from Unix epoch (1 Jan 1970) to EPICS epoch (1 Jan 1990) */
dval = dval-631152000u; dval = dval-631152000u;
pdbaddr->precord->time.secPastEpoch = (long)dval; pdbaddr->precord->time.secPastEpoch = (long)dval;
// rouding: we don't have 9 digits precision // rouding: we don't have 9 digits precision
// in a double of today's number of seconds // in a double of today's number of seconds
pdbaddr->precord->time.nsec = (long)((dval-(long)dval)*1e6)*1000; pdbaddr->precord->time.nsec = (long)((dval-(long)dval)*1e6)*1000;
debug("Stream::matchValue(%s): writing %i.%i to TIME field\n", debug("Stream::matchValue(%s): writing %i.%i to %s.TIME field\n",
name(), name(),
pdbaddr->precord->time.secPastEpoch, pdbaddr->precord->time.secPastEpoch,
pdbaddr->precord->time.nsec); pdbaddr->precord->time.nsec,
pdbaddr->precord->name);
pdbaddr->precord->tse = epicsTimeEventDeviceTime; pdbaddr->precord->tse = epicsTimeEventDeviceTime;
return true; return true;
#else #else
@ -1240,18 +1264,19 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
return false; return false;
#endif #endif
} }
if (format.type == string_format &&
(pdbaddr->field_type == DBF_CHAR || pdbaddr->field_type == DBF_UCHAR))
{
/* write strings to [U]CHAR arrays */
nord = consumed;
fmt.type = DBF_CHAR;
}
if (pdbaddr->precord == record || INIT_RUN) if (pdbaddr->precord == record || INIT_RUN)
{ {
// write into own record, thus don't process it // write into own record, thus don't process it
// in @init we must not process other record // in @init we must not process other record
debug("Stream::matchValue(%s): dbPut(%s.%s,%s)\n",
name(),
pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name,
fieldBuffer.expand()());
putfunc = "dbPut"; putfunc = "dbPut";
status = dbPut(pdbaddr, dbfMapping[format.type], buffer, nord); status = dbPut(pdbaddr, fmt.type, buffer, nord);
if (INIT_RUN && pdbaddr->precord != record) if (INIT_RUN && pdbaddr->precord != record)
{ {
// clean error status of other record in @init // clean error status of other record in @init
@ -1263,41 +1288,43 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
else else
{ {
// write into other record, thus process it // write into other record, thus process it
debug("Stream::matchValue(%s): dbPutField(%s.%s,%s)\n",
name(),
pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name,
fieldBuffer.expand()());
putfunc = "dbPutField"; putfunc = "dbPutField";
status = dbPutField(pdbaddr, dbfMapping[format.type], status = dbPutField(pdbaddr, fmt.type,
buffer, nord); buffer, nord);
} }
debug("Stream::matchValue(%s): %s(%s.%s, %s, %s) status=0x%x\n",
name(), putfunc,
pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name,
pamapdbfType[fmt.type].strvalue,
fieldBuffer.expand()(),
status);
if (status != 0) if (status != 0)
{ {
flags &= ~ScanTried; flags &= ~ScanTried;
switch (format.type) switch (fmt.type)
{ {
case long_format: case DBF_LONG:
case enum_format: case DBF_ENUM:
error("%s: %s(%s.%s, %s, %li) failed\n", error("%s: %s(%s.%s, %s, %li) failed\n",
putfunc, name(), pdbaddr->precord->name, name(), putfunc, pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name, ((dbFldDes*)pdbaddr->pfldDes)->name,
pamapdbfType[dbfMapping[format.type]].strvalue, pamapdbfType[fmt.type].strvalue,
lval); lval);
return false; return false;
case double_format: case DBF_DOUBLE:
error("%s: %s(%s.%s, %s, %#g) failed\n", error("%s: %s(%s.%s, %s, %#g) failed\n",
putfunc, name(), pdbaddr->precord->name, name(), putfunc, pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name, ((dbFldDes*)pdbaddr->pfldDes)->name,
pamapdbfType[dbfMapping[format.type]].strvalue, pamapdbfType[fmt.type].strvalue,
dval); dval);
return false; return false;
case string_format: case DBF_STRING:
error("%s: %s(%s.%s, %s, \"%s\") failed\n", error("%s: %s(%s.%s, %s, \"%.*s\") failed\n",
putfunc, name(), pdbaddr->precord->name, name(), putfunc, pdbaddr->precord->name,
((dbFldDes*)pdbaddr->pfldDes)->name, ((dbFldDes*)pdbaddr->pfldDes)->name,
pamapdbfType[dbfMapping[format.type]].strvalue, pamapdbfType[fmt.type].strvalue,
buffer); (int)consumed, buffer);
return false; return false;
default: default:
return false; return false;
@ -1306,9 +1333,6 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
return true; return true;
} }
// no fieldaddress (the "normal" case) // no fieldaddress (the "normal" case)
format_s fmt;
fmt.type = dbfMapping[format.type];
fmt.priv = &format;
if (!readData) if (!readData)
{ {
error("%s: No readData() function provided\n", name()); error("%s: No readData() function provided\n", name());