sessions: modify datatype tests cleanup path

With the changes for sessions, OMPI uses a different way
of cleaning up allocated resources,namely using a
registration of cleanup callbacks that are invoked
when opal_finalize_cleanup_domain is called on the
list of callbacks.  This obviates the need, for example,
for a test to explicitly cleanup datatype related resources
by invoking ompi_datatype_finalize explicitly.

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/datatype/ompi_datatype.h

@@ -118,7 +118,6 @@ OMPI_DECLSPEC extern opal_convertor_t* ompi_mpi_local_convertor;
 extern struct opal_pointer_array_t ompi_datatype_f_to_c_table;
 
 OMPI_DECLSPEC int32_t ompi_datatype_init( void );
-OMPI_DECLSPEC int32_t ompi_datatype_finalize( void );
 
 OMPI_DECLSPEC int32_t ompi_datatype_default_convertors_init( void );
 OMPI_DECLSPEC int32_t ompi_datatype_default_convertors_fini( void );

ompi/datatype/ompi_datatype_module.c

@@ -43,6 +43,8 @@
 
 #include "mpi.h"
 
+static int ompi_datatype_finalize (void);
+
 /**
  * This is the number of predefined datatypes. It is different than the MAX_PREDEFINED
  * as it include all the optional datatypes (such as MPI_INTEGER?, MPI_REAL?).
@@ -687,7 +689,7 @@ int32_t ompi_datatype_init( void )
 }
 
 
-int ompi_datatype_finalize (void)
+static int ompi_datatype_finalize (void)
 {
     int ret = OMPI_SUCCESS;
 

test/datatype/checksum.c

@@ -151,7 +151,6 @@ int main(int argc, char *argv[])
     free(packed);
 
     /* clean-ups all data allocations */
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return 0;

test/datatype/ddt_pack.c

@@ -500,7 +500,6 @@ int main(int argc, char *argv[])
     ompi_datatype_destroy(&dup_type);
 
 cleanup:
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return ret;

test/datatype/ddt_raw.c

@@ -342,7 +342,6 @@ int main(int argc, char *argv[])
     assert(pdt1 == NULL);
 
     /* clean-ups all data allocations */
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return OMPI_SUCCESS;

test/datatype/ddt_test.c

@@ -579,7 +579,7 @@ int main(int argc, char *argv[])
     assert(pdt2 == NULL);
 
     /* clean-ups all data allocations */
-    ompi_datatype_finalize();
+    opal_finalize_util();
 
     return OMPI_SUCCESS;
 }

test/datatype/external32.c

@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    ompi_datatype_finalize();
+    opal_finalize_util();
 
     return 0;
 }

test/datatype/partial.c

@@ -173,7 +173,6 @@ int main(int argc, char *argv[])
     free(packed);
 
     /* clean-ups all data allocations */
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return 0;

test/datatype/position.c

@@ -267,7 +267,6 @@ int main(int argc, char *argv[])
     }
     free(segments);
 
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return (0 == errors ? 0 : -1);

test/datatype/position_noncontig.c

@@ -235,7 +235,6 @@ int main(int argc, char *argv[])
     }
     free(segments);
 
-    ompi_datatype_finalize();
     opal_finalize_util();
 
     return (0 == errors ? 0 : -1);