Commit 57e4eaad authored by Podhorszki, Norbert's avatar Podhorszki, Norbert
Browse files

Fix BP5 ReadData: find block of interest through the flushes and calculate... 

Fix BP5 ReadData: find block of interest through the flushes and calculate file offset through the scattered flushes from the logically contiguous offset of the PG group.
parent 08990a8a

source/adios2/engine/bp5/BP5Reader.cpp

+22 −20
Original line number Diff line number Diff line
@@ -200,35 +200,37 @@ void BP5Reader::ReadData(const size_t WriterRank, const size_t Timestep, 
                                     {{"transport", "File"}}, false);

    }



    /* Each block is in exactly one flush. The StartOffset was calculated

       as if all the flushes were in a single contiguous block in file.

    */

    size_t InfoStartPos =

        DataPosPos + (WriterRank * (2 * FlushCount + 1) * sizeof(uint64_t));

    size_t ThisFlushInfo = InfoStartPos;

    size_t RemainingLength = Length;

    size_t ThisDataPos;

    size_t Offset = StartOffset;

    size_t SumDataSize = 0; // count in contiguous space

    for (size_t flush = 0; flush < FlushCount; flush++)

    {



        ThisDataPos =

            helper::ReadValue<uint64_t>(m_MetadataIndex.m_Buffer, ThisFlushInfo,

        size_t ThisDataPos =

            helper::ReadValue<uint64_t>(m_MetadataIndex.m_Buffer, InfoStartPos,

                                        m_Minifooter.IsLittleEndian);

        size_t ThisDataSize =

            helper::ReadValue<uint64_t>(m_MetadataIndex.m_Buffer, ThisFlushInfo,

            helper::ReadValue<uint64_t>(m_MetadataIndex.m_Buffer, InfoStartPos,

                                        m_Minifooter.IsLittleEndian);

        if (ThisDataSize > RemainingLength)

            ThisDataSize = RemainingLength;

        m_DataFileManager.ReadFile(Destination, ThisDataSize,



        if (StartOffset < SumDataSize + ThisDataSize)

        {

            // discount offsets of skipped flushes

            size_t Offset = StartOffset - SumDataSize;

            m_DataFileManager.ReadFile(Destination, Length,

                                       ThisDataPos + Offset, SubfileNum);

        Destination += ThisDataSize;

        RemainingLength -= ThisDataSize;

        Offset = 0;

        if (RemainingLength == 0)

            return;

        }

    ThisDataPos = helper::ReadValue<uint64_t>(

        m_MetadataIndex.m_Buffer, ThisFlushInfo, m_Minifooter.IsLittleEndian);

    m_DataFileManager.ReadFile(Destination, RemainingLength,

                               ThisDataPos + Offset, SubfileNum);

        SumDataSize += ThisDataSize;

    }



    size_t ThisDataPos = helper::ReadValue<uint64_t>(

        m_MetadataIndex.m_Buffer, InfoStartPos, m_Minifooter.IsLittleEndian);

    size_t Offset = StartOffset - SumDataSize;

    m_DataFileManager.ReadFile(Destination, Length, ThisDataPos + Offset,

                               SubfileNum);

}



void BP5Reader::PerformGets()