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

Preset buffer size removed (It was not the performance killer)

Browse Source 
Bugfix: InTerminator search: distinguisch between long input line and multi-line input
StreamBuffer::equals renamed to startswith
This commit is contained in:
zimoch
2010-10-14 12:18:48 +00:00
parent a941061a29
commit 649d775cd3
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/StreamCore.cc
View File

@ -245,7 +245,6 @@ compile(StreamProtocolParser::Protocol* protocol)
inTerminatorDefined = false; inTerminatorDefined = false;
outTerminatorDefined = false; outTerminatorDefined = false;
unsigned long bufferSize = 0;
unsigned short ignoreExtraInput = false; unsigned short ignoreExtraInput = false;
if (!protocol->getEnumVariable("extrainput", ignoreExtraInput, if (!protocol->getEnumVariable("extrainput", ignoreExtraInput,
extraInputNames)) extraInputNames))
@ -260,12 +259,10 @@ compile(StreamProtocolParser::Protocol* protocol)
protocol->getNumberVariable("maxinput", maxInput) && protocol->getNumberVariable("maxinput", maxInput) &&
// use replyTimeout as default for pollPeriod // use replyTimeout as default for pollPeriod
protocol->getNumberVariable("replytimeout", pollPeriod) && protocol->getNumberVariable("replytimeout", pollPeriod) &&
protocol->getNumberVariable("pollperiod", pollPeriod) && protocol->getNumberVariable("pollperiod", pollPeriod)))
protocol->getNumberVariable("buffersize", bufferSize)))
{ {
return false; return false;
} }
inputBuffer.grow(bufferSize);
if (!(protocol->getStringVariable("terminator", inTerminator, &inTerminatorDefined) && if (!(protocol->getStringVariable("terminator", inTerminator, &inTerminatorDefined) &&
protocol->getStringVariable("terminator", outTerminator, &outTerminatorDefined) && protocol->getStringVariable("terminator", outTerminator, &outTerminatorDefined) &&
protocol->getStringVariable("interminator", inTerminator, &inTerminatorDefined) && protocol->getStringVariable("interminator", inTerminator, &inTerminatorDefined) &&
@ -935,7 +932,6 @@ readCallback(StreamIoStatus status,
return 0; return 0;
} }
//// flags &= ~AcceptInput; //// flags &= ~AcceptInput;
unparsedInput = false;
switch (status) switch (status)
{ {
case StreamIoTimeout: case StreamIoTimeout:
@ -992,8 +988,26 @@ readCallback(StreamIoStatus status,
if (inTerminator) if (inTerminator)
{ {
// look for terminator // look for terminator
long start = inputBuffer.length() - size - inTerminator.length(); // performance issue for long inputs that come in chunks:
if (start < 0) start = 0; // do not parse old chunks again or performance decreases to O(n^2)
// but make sure to get all terminators in multi-line input
long start;
if (unparsedInput)
{
// multi-line input sets 'unparsedInput' and removes the line
// remaining unparsed lines are left at start of inputBuffer
start = 0;
}
else
{
// long line does not set 'unparsedInput' but keeps
// already parsed chunks in inputBuffer
// start parsing at beginning of new data
// but beware of split terminators
start = inputBuffer.length() - size - inTerminator.length();
if (start < 0) start = 0;
}
end = inputBuffer.find(inTerminator, start); end = inputBuffer.find(inTerminator, start);
if (end >= 0) if (end >= 0)
{ {
@ -1075,6 +1089,10 @@ readCallback(StreamIoStatus status,
name(), inputBuffer.expand()()); name(), inputBuffer.expand()());
unparsedInput = true; unparsedInput = true;
} }
else
{
unparsedInput = false;
}
if (!matches) if (!matches)
{ {
if (status == StreamIoTimeout) if (status == StreamIoTimeout)
@ -1241,7 +1259,7 @@ matchInput()
} }
return false; return false;
} }
if (!outputLine.equals(inputLine(consumedInput),outputLine.length())) if (!outputLine.startswith(inputLine(consumedInput),outputLine.length()))
{ {
if (!(flags & AsyncMode) && onMismatch[0] != in_cmd) if (!(flags & AsyncMode) && onMismatch[0] != in_cmd)
{ {
@ -1432,7 +1450,7 @@ scanValue(const StreamFormat& fmt, double& value)
long consumed = StreamFormatConverter::find(fmt.conv)-> long consumed = StreamFormatConverter::find(fmt.conv)->
scanDouble(fmt, inputLine(consumedInput), value); scanDouble(fmt, inputLine(consumedInput), value);
debug("StreamCore::scanValue(%s, format=%%%c, double) input=\"%s\"\n", debug("StreamCore::scanValue(%s, format=%%%c, double) input=\"%s\"\n",
name(), fmt.conv, inputLine.expand(consumedInput)()); name(), fmt.conv, inputLine.expand(consumedInput, 20)());
if (consumed < 0) if (consumed < 0)
{ {
if (fmt.flags & default_flag) if (fmt.flags & default_flag)