blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 10:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimize reading of repeating level 3 packet data

Browse source
This commit is contained in:
Dan Paulat 2022-01-08 21:48:56 -06:00
parent f1472275bc
commit bf56680d85
5 changed files with 80 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

16
wxdata/source/scwx/wsr88d/rpg/linked_contour_vector_packet.cpp
View file

@ -98,19 +98,17 @@ bool LinkedContourVectorPacket::Parse(std::istream& is)
// The number of vectors is equal to the size divided by the number of bytes // The number of vectors is equal to the size divided by the number of bytes
// in a vector coordinate // in a vector coordinate
int vectorCount = vectorSize / 4; int vectorCount = vectorSize / 4;
int16_t endI;
int16_t endJ; p->endI_.resize(vectorCount);
p->endJ_.resize(vectorCount);
for (int v = 0; v < vectorCount && !is.eof(); v++) for (int v = 0; v < vectorCount && !is.eof(); v++)
{ {
is.read(reinterpret_cast<char*>(&endI), 2); is.read(reinterpret_cast<char*>(&p->endI_[v]), 2);
is.read(reinterpret_cast<char*>(&endJ), 2); is.read(reinterpret_cast<char*>(&p->endJ_[v]), 2);
endI = ntohs(endI); p->endI_[v] = ntohs(p->endI_[v]);
endJ = ntohs(endJ); p->endJ_[v] = ntohs(p->endJ_[v]);
p->endI_.push_back(endI);
p->endJ_.push_back(endJ);
} }
if (is.eof()) if (is.eof())

16
wxdata/source/scwx/wsr88d/rpg/linked_vector_packet.cpp
View file

@ -111,19 +111,17 @@ bool LinkedVectorPacket::Parse(std::istream& is)
// The number of vectors is equal to the size divided by the number of bytes // The number of vectors is equal to the size divided by the number of bytes
// in a vector coordinate // in a vector coordinate
int vectorCount = vectorSize / 4; int vectorCount = vectorSize / 4;
int16_t endI;
int16_t endJ; p->endI_.resize(vectorCount);
p->endJ_.resize(vectorCount);
for (int v = 0; v < vectorCount && !is.eof(); v++) for (int v = 0; v < vectorCount && !is.eof(); v++)
{ {
is.read(reinterpret_cast<char*>(&endI), 2); is.read(reinterpret_cast<char*>(&p->endI_[v]), 2);
is.read(reinterpret_cast<char*>(&endJ), 2); is.read(reinterpret_cast<char*>(&p->endJ_[v]), 2);
endI = ntohs(endI); p->endI_[v] = ntohs(p->endI_[v]);
endJ = ntohs(endJ); p->endJ_[v] = ntohs(p->endJ_[v]);
p->endI_.push_back(endI);
p->endJ_.push_back(endJ);
} }
if (is.eof()) if (is.eof())

61
wxdata/source/scwx/wsr88d/rpg/text_and_special_symbol_packet.cpp
View file

@ -80,26 +80,15 @@ bool TextAndSpecialSymbolPacket::Parse(std::istream& is)
{ {
bool blockValid = true; bool blockValid = true;
std::streampos isBegin = is.tellg();
is.read(reinterpret_cast<char*>(&p->packetCode_), 2); is.read(reinterpret_cast<char*>(&p->packetCode_), 2);
is.read(reinterpret_cast<char*>(&p->lengthOfBlock_), 2); is.read(reinterpret_cast<char*>(&p->lengthOfBlock_), 2);
p->packetCode_ = ntohs(p->packetCode_); p->packetCode_ = ntohs(p->packetCode_);
p->lengthOfBlock_ = ntohs(p->lengthOfBlock_); p->lengthOfBlock_ = ntohs(p->lengthOfBlock_);
int vectorSize = static_cast<int>(p->lengthOfBlock_) - 4; int textLength = static_cast<int>(p->lengthOfBlock_) - 4;
if (is.eof())
{
BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "Reached end of file";
blockValid = false;
}
else if (p->packetCode_ == 8)
{
is.read(reinterpret_cast<char*>(&p->valueOfText_), 2);
p->valueOfText_ = ntohs(p->valueOfText_);
vectorSize -= 2;
}
is.read(reinterpret_cast<char*>(&p->startI_), 2); is.read(reinterpret_cast<char*>(&p->startI_), 2);
is.read(reinterpret_cast<char*>(&p->startJ_), 2); is.read(reinterpret_cast<char*>(&p->startJ_), 2);
@ -107,17 +96,6 @@ bool TextAndSpecialSymbolPacket::Parse(std::istream& is)
p->startI_ = ntohs(p->startI_); p->startI_ = ntohs(p->startI_);
p->startJ_ = ntohs(p->startJ_); p->startJ_ = ntohs(p->startJ_);
// The number of vectors is equal to the size divided by the number of bytes
// in a vector coordinate
int vectorCount = vectorSize;
char c;
for (int v = 0; v < vectorCount && !is.eof(); v++)
{
is.get(c);
p->characters_.push_back(c);
}
if (is.eof()) if (is.eof())
{ {
BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "Reached end of file"; BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "Reached end of file";
@ -131,6 +109,39 @@ bool TextAndSpecialSymbolPacket::Parse(std::istream& is)
<< logPrefix_ << "Invalid packet code: " << p->packetCode_; << logPrefix_ << "Invalid packet code: " << p->packetCode_;
blockValid = false; blockValid = false;
} }
else if (p->lengthOfBlock_ < 1 || p->lengthOfBlock_ > 32767)
{
BOOST_LOG_TRIVIAL(warning)
<< logPrefix_ << "Invalid length of block: " << p->packetCode_;
blockValid = false;
}
else if (p->packetCode_ == 8)
{
is.read(reinterpret_cast<char*>(&p->valueOfText_), 2);
p->valueOfText_ = ntohs(p->valueOfText_);
textLength -= 2;
}
}
if (blockValid && textLength < 0)
{
BOOST_LOG_TRIVIAL(warning)
<< logPrefix_ << "Too few bytes in block: " << p->lengthOfBlock_;
blockValid = false;
}
if (blockValid)
{
p->characters_.resize(textLength);
is.read(reinterpret_cast<char*>(p->characters_.data()), textLength);
}
std::streampos isEnd = is.tellg();
if (!ValidateMessage(is, isEnd - isBegin))
{
blockValid = false;
} }
return blockValid; return blockValid;

30
wxdata/source/scwx/wsr88d/rpg/unlinked_contour_vector_packet.cpp
View file

@ -81,27 +81,23 @@ bool UnlinkedContourVectorPacket::Parse(std::istream& is)
// The number of vectors is equal to the size divided by the number of bytes // The number of vectors is equal to the size divided by the number of bytes
// in a vector // in a vector
int vectorCount = vectorSize / 8; int vectorCount = vectorSize / 8;
int16_t beginI;
int16_t beginJ; p->beginI_.resize(vectorCount);
int16_t endI; p->beginJ_.resize(vectorCount);
int16_t endJ; p->endI_.resize(vectorCount);
p->endJ_.resize(vectorCount);
for (int v = 0; v < vectorCount && !is.eof(); v++) for (int v = 0; v < vectorCount && !is.eof(); v++)
{ {
is.read(reinterpret_cast<char*>(&beginI), 2); is.read(reinterpret_cast<char*>(&p->beginI_[v]), 2);
is.read(reinterpret_cast<char*>(&beginJ), 2); is.read(reinterpret_cast<char*>(&p->beginJ_[v]), 2);
is.read(reinterpret_cast<char*>(&endI), 2); is.read(reinterpret_cast<char*>(&p->endI_[v]), 2);
is.read(reinterpret_cast<char*>(&endJ), 2); is.read(reinterpret_cast<char*>(&p->endJ_[v]), 2);
beginI = ntohs(beginI); p->beginI_[v] = ntohs(p->beginI_[v]);
beginJ = ntohs(beginJ); p->beginJ_[v] = ntohs(p->beginJ_[v]);
endI = ntohs(endI); p->endI_[v] = ntohs(p->endI_[v]);
endJ = ntohs(endJ); p->endJ_[v] = ntohs(p->endJ_[v]);
p->beginI_.push_back(beginI);
p->beginJ_.push_back(beginJ);
p->endI_.push_back(endI);
p->endJ_.push_back(endJ);
} }
if (is.eof()) if (is.eof())

30
wxdata/source/scwx/wsr88d/rpg/unlinked_vector_packet.cpp
View file

@ -106,27 +106,23 @@ bool UnlinkedVectorPacket::Parse(std::istream& is)
// The number of vectors is equal to the size divided by the number of bytes // The number of vectors is equal to the size divided by the number of bytes
// in a vector // in a vector
int vectorCount = vectorSize / 8; int vectorCount = vectorSize / 8;
int16_t beginI;
int16_t beginJ; p->beginI_.resize(vectorCount);
int16_t endI; p->beginJ_.resize(vectorCount);
int16_t endJ; p->endI_.resize(vectorCount);
p->endJ_.resize(vectorCount);
for (int v = 0; v < vectorCount && !is.eof(); v++) for (int v = 0; v < vectorCount && !is.eof(); v++)
{ {
is.read(reinterpret_cast<char*>(&beginI), 2); is.read(reinterpret_cast<char*>(&p->beginI_[v]), 2);
is.read(reinterpret_cast<char*>(&beginJ), 2); is.read(reinterpret_cast<char*>(&p->beginJ_[v]), 2);
is.read(reinterpret_cast<char*>(&endI), 2); is.read(reinterpret_cast<char*>(&p->endI_[v]), 2);
is.read(reinterpret_cast<char*>(&endJ), 2); is.read(reinterpret_cast<char*>(&p->endJ_[v]), 2);
beginI = ntohs(beginI); p->beginI_[v] = ntohs(p->beginI_[v]);
beginJ = ntohs(beginJ); p->beginJ_[v] = ntohs(p->beginJ_[v]);
endI = ntohs(endI); p->endI_[v] = ntohs(p->endI_[v]);
endJ = ntohs(endJ); p->endJ_[v] = ntohs(p->endJ_[v]);
p->beginI_.push_back(beginI);
p->beginJ_.push_back(beginJ);
p->endI_.push_back(endI);
p->endJ_.push_back(endJ);
} }
if (is.eof()) if (is.eof())