Changeset 267 for XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.cpp

Timestamp:

09/07/11 14:25:56 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.cpp (modified) (7 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.cpp

@@ -1 +1 @@
 #include "buffer_pair.hpp"
 
-#include "impi_interface.hpp"
+#include "mpi_manager.hpp"
 
 namespace xmlioserver
@@ -11 +11 @@
          : com_client_server(com_client_server) 
          , first(BUFFER_CLIENT_SIZE), second(BUFFER_CLIENT_SIZE)
-         , first_request(mpi_request_null), second_request(mpi_request_null)
+         , first_request(MPI_REQUEST_NULL), second_request(MPI_REQUEST_NULL)
          , currentBuffer(0)
       { /* Ne rien faire de plus */ }
@@ -23 +23 @@
       {
          if ((currentBuffer  ==  0) && (first.getUsedSize()  != 0) &&
-            ((second_request == mpi_request_null) || CMPIManager::Test (second_request)))
+            ((second_request == MPI_REQUEST_NULL) || CMPIManager::Test (second_request)))
              return (true);
              
          if ((currentBuffer  ==  1) && (second.getUsedSize() != 0) &&
-            ((first_request  == mpi_request_null) || CMPIManager::Test (first_request)))
+            ((first_request  == MPI_REQUEST_NULL) || CMPIManager::Test (first_request)))
             return (true);
             
@@ -35 +35 @@
       //---------------------------------------------------------------
       
-      int CBufferPair::wait(void)
+      MPI_Request CBufferPair::wait(void)
       {
          if (this->currentBuffer == 0)
          {
             CMPIManager::Wait(this->second_request);
-            this->second_request = mpi_request_null;
+            this->second_request = MPI_REQUEST_NULL;
             return (this->second_request);
          }
@@ -46 +46 @@
          {
             CMPIManager::Wait(this->first_request);
-            this->first_request = mpi_request_null;
+            this->first_request = MPI_REQUEST_NULL;
             return (this->first_request);
          }
@@ -60 +60 @@
                (this->com_client_server, 0, this->first, this->first_request);
             this->currentBuffer  =  1;
-            this->second_request = mpi_request_null;
+            this->second_request = MPI_REQUEST_NULL;
             this->second.clear();
          }
@@ -68 +68 @@
                (this->com_client_server, 0, this->second, this->second_request);
             this->currentBuffer =  0;
-            this->first_request = mpi_request_null;
+            this->first_request = MPI_REQUEST_NULL;
             this->first.clear();
          }