Skip to content

add check in TOF compressor before to save RDH open #13389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noferini merged 1 commit into from
Aug 17, 2024
Merged

add check in TOF compressor before to save RDH open #13389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Detectors/TOF/compression/include/TOFCompression/Compressor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,13 @@ class Compressor
/** encoder private functions and data members **/

int encoderSpider(int itrm);
inline void encoderRewind() { mEncoderPointer = reinterpret_cast<uint32_t*>(mEncoderBuffer); };
inline void encoderRewind()
{
mEncoderPointer = reinterpret_cast<uint32_t*>(mEncoderBuffer);
if (mEncoderPointerStart > mEncoderPointer) {
mEncoderPointerStart = mEncoderPointer;
}
};
inline int encoderNext()
{
if (mEncoderPointer + 1 >= mEncoderPointerMax) {
Expand Down
11 changes: 11 additions & 0 deletions Detectors/TOF/compression/src/Compressor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,17 @@ bool Compressor<RDH, verbose, paranoid>::processHBF()
mErrorCounter++;
}

// before to move to RDH close check we are not already out of buffer (it is the last chance to call rewind and not to store RDH open)
if (mEncoderPointer >= mEncoderPointerMax) {
LOG(error) << "link = " << rdh->feeId << ": beyond the buffer size mEncoderPointer in RDH open = " << mEncoderPointer << " >= "
<< "mEncoderPointerMax = " << mEncoderPointerMax;
long byteOutOfBuffer = mEncoderPointer + rdh->headerSize - mEncoderPointerMax;
LOG(error) << "byte out of buffer = " << byteOutOfBuffer;

encoderRewind();
return true;
}

/** copy RDH close to encoder buffer **/
/** CAREFUL WITH THE PAGE COUNTER **/
if (mEncoderPointer + rdh->headerSize >= mEncoderPointerMax) {
Expand Down