Commit b7f8d615 authored by Bolea Sanchez, Vicente Adolfo's avatar Bolea Sanchez, Vicente Adolfo
Browse files

bp: workaround for char overflow in bp vers 

BP files bits assigned to the minor version of ADIOS2 is
a single character long, when moving to adios 2.10.0 we
run into an ASCII overflow here. This patch uses the next ASCII
character after '9' for minor versions after 9. This will buy us
sometime to resolve this issue.
parent 3f91c411

source/adios2/engine/bp5/BP5Writer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1236,7 +1236,8 @@ void BP5Writer::MakeHeader(std::vector<char> &buffer, size_t &position, const st 
    }



    const std::string majorVersion(std::to_string(ADIOS2_VERSION_MAJOR));

    const std::string minorVersion(std::to_string(ADIOS2_VERSION_MINOR));

    const char minorVersionChar = '0' + ADIOS2_VERSION_MINOR;

    const std::string minorVersion(1, minorVersionChar);

    const std::string patchVersion(std::to_string(ADIOS2_VERSION_PATCH));



    // byte 0-31: Readable tag

source/adios2/toolkit/format/bp/BPSerializer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ void BPSerializer::PutMinifooter(const uint64_t pgIndexStart, const uint64_t var 
    };



    const std::string majorVersion(std::to_string(ADIOS2_VERSION_MAJOR));

    const std::string minorVersion(std::to_string(ADIOS2_VERSION_MINOR));

    const char minorVersionChar = '0' + ADIOS2_VERSION_MINOR;

    const std::string minorVersion(1, minorVersionChar);

    const std::string patchVersion(std::to_string(ADIOS2_VERSION_PATCH));



    const std::string versionLongTag("ADIOS-BP v" + majorVersion + "." + minorVersion + "." +

source/adios2/toolkit/format/bp/bp4/BP4Serializer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ void BP4Serializer::MakeHeader(BufferSTL &b, const std::string fileType, const b 
    }



    const std::string majorVersion(std::to_string(ADIOS2_VERSION_MAJOR));

    const std::string minorVersion(std::to_string(ADIOS2_VERSION_MINOR));

    const char minorVersionChar = '0' + ADIOS2_VERSION_MINOR;

    const std::string minorVersion(1, minorVersionChar);

    const std::string patchVersion(std::to_string(ADIOS2_VERSION_PATCH));



    // byte 0-31: Readable tag