FFS upstream

source/adios2/engine/ssc/SscWriter.cpp

@@ -61,12 +61,16 @@ StepStatus SscWriter::BeginStep(StepMode mode, const float timeoutSeconds)
         m_GlobalReadPattern.resize(m_StreamSize);
     }
 
-    if (m_WriterDefinitionsLocked && m_ReaderSelectionsLocked)
+    if (m_CurrentStep > 1)
     {
-        if (m_CurrentStep > 1)
+        if (m_WriterDefinitionsLocked && m_ReaderSelectionsLocked)
         {
             MpiWait();
         }
+        else
+        {
+            MPI_Win_free(&m_MpiWin);
+        }
     }
 
     return StepStatus::OK;
@@ -150,7 +154,6 @@ void SscWriter::EndStep()
             SyncWritePattern();
             MPI_Win_create(m_Buffer.data(), m_Buffer.size(), 1, MPI_INFO_NULL,
                            m_StreamComm, &m_MpiWin);
-            MPI_Win_free(&m_MpiWin);
         }
     }
 }
@@ -429,6 +432,7 @@ void SscWriter::DoClose(const int transportIndex)
     }
     else
     {
+        MPI_Win_free(&m_MpiWin);
         SyncWritePattern(true);
     }
 }

thirdparty/ffs/ffs/cod/cod.y

@@ -120,6 +120,8 @@ gen_anon()
 #define yyrestart cod_yyrestart
 #define yywrap cod_yywrap
 #define yyerror cod_yyerror
+#define yylineno cod_yylineno
+#define yy_flex_debug cod_yy_flex_debug
 #define yy_create_buffer cod_yy_create_buffer
 #define yy_delete_buffer cod_yy_delete_buffer
 #define yy_flush_buffer cod_yy_flush_buffer