Fix RawParser: set proper size estimate for payload

wiechula · shahor02 · commit ffe29d0630f0 · 2020-03-13T08:45:14.000+01:00
So far the fixed page size has been used to calculate the size of the payload,
simply because of the lack of information at the time of implmenting the parser.
The variable size of the payload is stored in the member memorySize in both
RDH v4 and v5. Since the raw parser does only supports those two versions at
the moment, the fix can be applied as it is. there is no need to support RDH v2
which has a member blockLength.
diff --git a/Framework/Utils/include/DPLUtils/RawParser.h b/Framework/Utils/include/DPLUtils/RawParser.h
@@ -117,8 +117,7 @@ class ConcreteRawParser
       return 0;
     }
     header_type const& h = header();
-    // FIXME: block length disappeared in V5, check what can be used
-    return max_size - h.headerSize;
+    return h.memorySize - h.headerSize;
   }
 
   /// Get pointer to payload data at current position
diff --git a/Framework/Utils/test/test_RawParser.cxx b/Framework/Utils/test/test_RawParser.cxx
@@ -30,6 +30,7 @@ BOOST_AUTO_TEST_CASE(test_RawParser)
     rdh->version = 5;
     rdh->headerSize = sizeof(V5);
     rdh->offsetToNext = PageSize;
+    rdh->memorySize = PageSize;
     rdh->pageCnt = NofPages;
     rdh->packetCounter = pageNo;
     rdh->stop = pageNo + 1 == NofPages;

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,7 @@ class ConcreteRawParser`
`117`	`117`	`return 0;`
`118`	`118`	`}`
`119`	`119`	`header_type const& h = header();`
`120`		`- // FIXME: block length disappeared in V5, check what can be used`
`121`		`- return max_size - h.headerSize;`
	`120`	`+ return h.memorySize - h.headerSize;`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`/// Get pointer to payload data at current position`