matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature (contd.): Variable Fields - AbstractProtocol now caches the frameVariableCount (of variableFields)

Browse Source
This commit is contained in:
Srivats P. 2015-05-27 21:28:40 +05:30
parent 7a1f791a37
commit 4f2abcb789
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/abstractprotocol.cpp
View File

@ -76,6 +76,7 @@ AbstractProtocol::AbstractProtocol(StreamBase *stream, AbstractProtocol *parent)
prev = next = NULL; prev = next = NULL;
_metaFieldCount = -1; _metaFieldCount = -1;
_frameFieldCount = -1; _frameFieldCount = -1;
_frameVariableCount = -1;
protoSize = -1; protoSize = -1;
_hasPayload = true; _hasPayload = true;
} }
@ -384,6 +385,9 @@ int AbstractProtocol::variableFieldCount() const
void AbstractProtocol::appendVariableField(const OstProto::VariableField &vf) void AbstractProtocol::appendVariableField(const OstProto::VariableField &vf)
{ {
_data.add_variable_fields()->CopyFrom(vf); _data.add_variable_fields()->CopyFrom(vf);
// Update the cached value
_frameVariableCount = lcm(_frameVariableCount, vf.count());
} }
/*! /*!
@ -408,8 +412,12 @@ void AbstractProtocol::removeVariableField(int index)
} }
_data.clear_variable_fields(); _data.clear_variable_fields();
_frameVariableCount = 1;
for (int i = 0; i < temp.variable_fields_size(); i++) { for (int i = 0; i < temp.variable_fields_size(); i++) {
_data.add_variable_fields()->CopyFrom(temp.variable_fields(i)); _data.add_variable_fields()->CopyFrom(temp.variable_fields(i));
// Recalculate the cached value
_frameVariableCount = lcm(_frameVariableCount,
_data.variable_fields(i).count());
} }
} }
@ -433,6 +441,9 @@ OstProto::VariableField* AbstractProtocol::mutableVariableField(int index)
if ((index < 0) || (index >= _data.variable_fields_size())) if ((index < 0) || (index >= _data.variable_fields_size()))
return NULL; return NULL;
// Invalidate the cached value as the caller may potentially modify it
_frameVariableCount = -1;
return _data.mutable_variable_fields(index); return _data.mutable_variable_fields(index);
} }
@ -710,13 +721,15 @@ bool AbstractProtocol::isProtocolFrameSizeVariable() const
*/ */
int AbstractProtocol::protocolFrameVariableCount() const int AbstractProtocol::protocolFrameVariableCount() const
{ {
int count = 1; if (_frameVariableCount > 0)
return _frameVariableCount;
_frameVariableCount = 1;
for (int i = 0; i < _data.variable_fields_size(); i++) for (int i = 0; i < _data.variable_fields_size(); i++)
count = lcm(count, _data.variable_fields(i).count()); _frameVariableCount = lcm(_frameVariableCount,
_data.variable_fields(i).count());
// TODO: cache the value! return _frameVariableCount;
return count;
} }
/*! /*!

1
common/abstractprotocol.h
View File

@ -47,6 +47,7 @@ class AbstractProtocol
private: private:
mutable int _metaFieldCount; mutable int _metaFieldCount;
mutable int _frameFieldCount; mutable int _frameFieldCount;
mutable int _frameVariableCount;
mutable int protoSize; mutable int protoSize;
mutable QString protoAbbr; mutable QString protoAbbr;
OstProto::Protocol _data; OstProto::Protocol _data;