Changeset 2240 for XIOS/dev

Timestamp:

09/30/21 14:22:35 (3 years ago)

Author:

jderouillat

Message:

Operate MPI windows free. Otherwise MPI will try to free it itself without respecting an adapted order, which will lead to a deadlock

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• context_client.cpp (modified) (2 diffs)
• context_server.cpp (modified) (2 diffs)
• node/context.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_client.cpp

@@ -373 +373 @@
       buffers.clear();
 
-/* don't know when release windows
+// don't know when release windows
 
       if (!isAttachedModeEnabled())
@@ -383 +383 @@
         }
       } 
-*/
+
    }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_server.cpp

@@ -412 +412 @@
       }
     } while (! out) ; 
+      MPI_Win_free(&windows[0]) ;
+      MPI_Win_free(&windows[1]) ;
   }
 
@@ -441 +443 @@
       context->finalize();
 
-/* don't know where release windows
+// don't know where release windows
       MPI_Win_free(&windows[0]) ;
       MPI_Win_free(&windows[1]) ;
-*/     
+     
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
                            iteMap = mapBufferSize_.end(), itMap;

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -742 +742 @@
           notifiedFinalized=client->isNotifiedFinalized() ;
         } while (!notifiedFinalized) ;
+        server->releaseBuffers();
         client->releaseBuffers();
         info(100)<<"DEBUG: context "<<getId()<<" release client ok"<<endl ;
@@ -770 +771 @@
       {
         closeAllFile();
+        client->releaseBuffers();
       }