Use engine params to control attribute marshalling

source/adios2/engine/bp5/BP5Engine.h

@@ -160,6 +160,7 @@ class BP5Engine
     MACRO(StatsLevel, UInt, unsigned int, 1)                                   \
     MACRO(StatsBlockSize, SizeBytes, size_t, DefaultStatsBlockSize)            \
     MACRO(Threads, UInt, unsigned int, 0)                                      \
+    MACRO(UseOneTimeAttributes, Bool, bool, true)                              \
     MACRO(MaxOpenFilesAtOnce, UInt, unsigned int, UINT_MAX)
 
     struct BP5Params

source/adios2/engine/bp5/BP5Writer.cpp

@@ -72,7 +72,7 @@ StepStatus BP5Writer::BeginStep(StepMode mode, const float timeoutSeconds)
         }
     }
 
-    if ((m_WriterStep == 0) && !getenv("OldAttr"))
+    if ((m_WriterStep == 0) && m_Parameters.UseOneTimeAttributes)
     {
         const auto &attributes = m_IO.GetAttributes();
 
@@ -440,7 +440,7 @@ void BP5Writer::NotifyEngineAttribute(std::string name, DataType type) noexcept
 void BP5Writer::NotifyEngineAttribute(std::string name, AttributeBase *Attr,
                                       void *data) noexcept
 {
-    if (getenv("OldAttr"))
+    if (!m_Parameters.UseOneTimeAttributes)
     {
         m_MarshalAttributesNecessary = true;
         return;

source/adios2/engine/sst/SstWriter.cpp

@@ -2,7 +2,7 @@
  * Distributed under the OSI-approved Apache License, Version 2.0.  See
  * accompanying file Copyright.txt for details.
  *
- * Sst.cpp
+ * SstWriter.cpp
  *
  *  Created on: Aug 17, 2017
  *      Author: Greg Eisenhauer
@@ -187,10 +187,16 @@ void SstWriter::MarshalAttributes()
     PERFSTUBS_SCOPED_TIMER_FUNC();
     const auto &attributes = m_IO.GetAttributes();
 
-    const uint32_t attributesCount = static_cast<uint32_t>(attributes.size());
+    if ((m_WriterStep == 0) && Params.UseOneTimeAttributes)
+    {
+        for (const auto &attributePair : attributes)
+        {
+            m_BP5Serializer->OnetimeMarshalAttribute(*(attributePair.second));
+        }
+    }
 
     // if there are no new attributes, nothing to do
-    if (attributesCount == m_MarshaledAttributesCount)
+    if (!m_MarshalAttributesNecessary)
         return;
 
     for (const auto &attributePair : attributes)
@@ -245,7 +251,20 @@ void SstWriter::MarshalAttributes()
         ADIOS2_FOREACH_ATTRIBUTE_PRIMITIVE_STDTYPE_1ARG(declare_type)
 #undef declare_type
     }
-    m_MarshaledAttributesCount = attributesCount;
+    m_MarshalAttributesNecessary = false;
+}
+
+void SstWriter::NotifyEngineAttribute(std::string name, AttributeBase *Attr,
+                                      void *data) noexcept
+{
+    if (!Params.UseOneTimeAttributes)
+    {
+        m_MarshalAttributesNecessary = true;
+        return;
+    }
+
+    m_BP5Serializer->OnetimeMarshalAttribute(*Attr);
+    m_MarshalAttributesNecessary = false;
 }
 
 void SstWriter::EndStep()

source/adios2/engine/sst/SstWriter.h

@@ -41,6 +41,8 @@ class SstWriter : public Engine
     void PerformPuts() final;
     void EndStep() final;
     void Flush(const int transportIndex = -1) final;
+    void NotifyEngineAttribute(std::string name, AttributeBase *Attr,
+                               void *data) noexcept;
 
     /**
      * Called if destructor is called on an open engine.  Should warn or take
@@ -85,7 +87,7 @@ class SstWriter : public Engine
     SstStream m_Output;
     long m_WriterStep = -1;
     bool m_DefinitionsNotified = false;
-    size_t m_MarshaledAttributesCount = 0;
+    bool m_MarshalAttributesNecessary = true; // first time through, marshal
     struct _SstParams Params;
 
     void MarshalAttributes();

source/adios2/toolkit/sst/sst_data.h

@@ -77,6 +77,7 @@ typedef struct _SstStats
     MACRO(SpeculativePreloadMode, SpecPreloadMode, int, SpecPreloadAuto)       \
     MACRO(SpecAutoNodeThreshold, Int, int, 1)                                  \
     MACRO(ReaderShortCircuitReads, Bool, int, 0)                               \
+    MACRO(UseOneTimeAttributes, Bool, int, 0)                                  \
     MACRO(ControlModule, String, char *, NULL)
 
 typedef enum