Merge pull request #2899 from eisenhauer/MultiVarFix

Fix issue with BP5 Deserializer
ornladios · Oct 12, 2021 · 1c1c0b7 · 1c1c0b7
2 parents a3a1916 + 3f3362a
commit 1c1c0b7
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 190 deletions.
diff --git a/source/adios2/toolkit/format/bp5/BP5Base.cpp b/source/adios2/toolkit/format/bp5/BP5Base.cpp
@@ -23,7 +23,7 @@ namespace adios2
 namespace format
 {
 
-void BP5Base::FFSBitfieldSet(struct FFSMetadataInfoStruct *MBase, int Bit)
+void BP5Base::BP5BitfieldSet(struct BP5MetadataInfoStruct *MBase, int Bit)
 {
     size_t Element = Bit / (sizeof(size_t) * 8);
     int ElementBit = Bit % (sizeof(size_t) * 8);
@@ -38,17 +38,13 @@ void BP5Base::FFSBitfieldSet(struct FFSMetadataInfoStruct *MBase, int Bit)
     MBase->BitField[Element] |= ((size_t)1 << ElementBit);
 }
 
-int BP5Base::FFSBitfieldTest(struct FFSMetadataInfoStruct *MBase, int Bit)
+int BP5Base::BP5BitfieldTest(struct BP5MetadataInfoStruct *MBase, int Bit)
 {
     size_t Element = Bit / (sizeof(size_t) * 8);
     int ElementBit = Bit % (sizeof(size_t) * 8);
     if (static_cast<size_t>(Element) >= MBase->BitFieldCount)
     {
-        MBase->BitField =
-            (size_t *)realloc(MBase->BitField, sizeof(size_t) * (Element + 1));
-        memset(MBase->BitField + MBase->BitFieldCount, 0,
-               (Element - MBase->BitFieldCount + 1) * sizeof(size_t));
-        MBase->BitFieldCount = Element + 1;
+        return 0;
     }
     return ((MBase->BitField[Element] & ((size_t)1 << ElementBit)) ==
             ((size_t)1 << ElementBit));

diff --git a/source/adios2/toolkit/format/bp5/BP5Base.h b/source/adios2/toolkit/format/bp5/BP5Base.h
@@ -46,15 +46,15 @@ class BP5Base
         size_t *DataLocation; // Per-block Offsets [BlockCount]
     } MetaArrayRec;
 
-    struct FFSMetadataInfoStruct
+    struct BP5MetadataInfoStruct
     {
         size_t BitFieldCount;
         size_t *BitField;
         size_t DataBlockSize;
     };
 
-    void FFSBitfieldSet(struct FFSMetadataInfoStruct *MBase, int Bit);
-    int FFSBitfieldTest(struct FFSMetadataInfoStruct *MBase, int Bit);
+    void BP5BitfieldSet(struct BP5MetadataInfoStruct *MBase, int Bit);
+    int BP5BitfieldTest(struct BP5MetadataInfoStruct *MBase, int Bit);
 };
 } // end namespace format
 } // end namespace adios2