Changeset 190

Timestamp:

05/11/11 11:04:10 (12 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (1 diff)
• src/xmlio/buffer_pair.hpp (modified) (3 diffs)
• src/xmlio/client.cpp (added)
• src/xmlio/client.hpp (added)
• src/xmlio/main_server.cpp (modified) (2 diffs)
• src/xmlio/server.cpp (added)
• src/xmlio/server.hpp (added)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -323 +323 @@
            buffer_list buffer_pair                          \
            data_treatment data_output                       \
-           rebuild functor configure
+           rebuild functor client server configure 
 
 # Sources des gestionnaires (contenues dans le dossier manager)

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

@@ -34 +34 @@
                                    A3 * arg3 = CLinearBuffer::NULL_ARG,
                                    A4 * arg4 = CLinearBuffer::NULL_ARG);
-                                  
+            /// Accesseur ///    
+            CLinearBuffer & getCurrentBuffer(void);
+                           
             /// Destructeur ///
             virtual ~CBufferPair(void);
@@ -45 +47 @@
             /// Traitements divers ///
             void wait(void);
-            void sendCurrentBuffer(void);
-            
-            /// Accesseur ///    
-            CLinearBuffer & getCurrentBuffer(void);
+            void sendCurrentBuffer(void);           
 
          private :
 
+            /// Propriétés privées ///
             MPIComm com_client_server;
             CLinearBuffer first, second;
@@ -75 +75 @@
          long int nbargs = 0;
          
-         if (arg1 != CLinearBuffer::NULL_ARG) nbargs++;
-         if (arg2 != CLinearBuffer::NULL_ARG) nbargs++;
-         if (arg3 != CLinearBuffer::NULL_ARG) nbargs++;
-         if (arg4 != CLinearBuffer::NULL_ARG) nbargs++;
+         if (arg1 != NULL) nbargs++;
+         if (arg2 != NULL) nbargs++;
+         if (arg3 != NULL) nbargs++;
+         if (arg4 != NULL) nbargs++;
          
          if (rsize > msize)

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

@@ -10 +10 @@
 int main(int argc, char ** argv, char ** UNUSED(env))
 {
-   try
+   /*try
    {
       //comm::CMPIManager::Initialise(&argc, &argv); // < seulement en mode connecté
@@ -30 +30 @@
       CMPIManager::Finalize();
       return (EXIT_FAILURE);
-   }
+   }*/
    return (EXIT_SUCCESS);
 }