* rename ompi_object and ompi_class to opal_object and opal_class

This commit was SVN r6321.

ompi/attribute/attribute.c

@@ -351,7 +351,7 @@ typedef enum ompi_attribute_translate_t {
  * struct to hold attribute values on each MPI object
  */
 typedef struct attribute_value_t {
-    ompi_object_t super;
+    opal_object_t super;
     void *av_value;
     MPI_Aint *av_address_kind_pointer;
     MPI_Fint *av_integer_pointer;
@@ -380,7 +380,7 @@ static MPI_Aint translate_to_fortran_mpi2(attribute_value_t *val);
  * attribute_value_t class
  */
 static OBJ_CLASS_INSTANCE(attribute_value_t,
-                          ompi_object_t,
+                          opal_object_t,
                           attribute_value_construct,
                           NULL);
 
@@ -389,7 +389,7 @@ static OBJ_CLASS_INSTANCE(attribute_value_t,
  * ompi_attribute_entry_t classes
  */
 static OBJ_CLASS_INSTANCE(ompi_attrkey_item_t, 
-                          ompi_object_t,
+                          opal_object_t,
                           ompi_attrkey_item_construct,
                           ompi_attrkey_item_destruct);
 
@@ -433,7 +433,7 @@ static void
 ompi_attrkey_item_construct(ompi_attrkey_item_t *item) 
 {
     memset(&(item->attr_type), 0, 
-	   sizeof(ompi_attrkey_item_t) - sizeof(ompi_object_t));
+	   sizeof(ompi_attrkey_item_t) - sizeof(opal_object_t));
 }
 
 

ompi/attribute/attribute.h

@@ -28,7 +28,7 @@
 
 #include "ompi_config.h"
 #include "include/constants.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_bitmap.h"
 #include "class/ompi_hash_table.h"
 #include "mca/gpr/gpr_types.h"
@@ -139,7 +139,7 @@ union ompi_attribute_fortran_ptr_t {
 typedef union ompi_attribute_fortran_ptr_t ompi_attribute_fortran_ptr_t;
 
 struct ompi_attrkey_item_t {
-    ompi_object_t super;
+    opal_object_t super;
     ompi_attribute_type_t attr_type; /**< One of COMM/WIN/DTYPE. This
 				       will be used to cast the
 				       copy/delete attribute functions

ompi/class/ompi_bitmap.c

@@ -27,7 +27,7 @@
 static void ompi_bitmap_construct(ompi_bitmap_t *bm);
 static void ompi_bitmap_destruct(ompi_bitmap_t *bm);
 
-OBJ_CLASS_INSTANCE(ompi_bitmap_t, ompi_object_t, 
+OBJ_CLASS_INSTANCE(ompi_bitmap_t, opal_object_t, 
                    ompi_bitmap_construct, ompi_bitmap_destruct);
 
 

ompi/class/ompi_bitmap.h

@@ -114,13 +114,13 @@
 #include <string.h>
 
 #include "include/types.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
 struct ompi_bitmap_t {
-    ompi_object_t super; /**< Subclass of ompi_object_t */
+    opal_object_t super; /**< Subclass of opal_object_t */
     unsigned char *bitmap; /**< The actual bitmap array of characters */
     int array_size;  /**< The actual array size that maintains the bitmap */
     int legal_numbits; /**< The number of bits which are legal (the

ompi/class/ompi_free_list.c

@@ -24,11 +24,11 @@ static void ompi_free_list_construct(ompi_free_list_t* fl);
 static void ompi_free_list_destruct(ompi_free_list_t* fl);
 
 
-ompi_class_t ompi_free_list_t_class = {
+opal_class_t ompi_free_list_t_class = {
     "ompi_free_list_t", 
     OBJ_CLASS(ompi_list_t),
-    (ompi_construct_t)ompi_free_list_construct, 
+    (opal_construct_t)ompi_free_list_construct, 
-    (ompi_destruct_t)ompi_free_list_destruct
+    (opal_destruct_t)ompi_free_list_destruct
 };
 
 
@@ -52,7 +52,7 @@ static void ompi_free_list_destruct(ompi_free_list_t* fl)
 int ompi_free_list_init(
     ompi_free_list_t *flist,
     size_t elem_size,
-    ompi_class_t* elem_class,
+    opal_class_t* elem_class,
     int num_elements_to_alloc,
     int max_elements_to_alloc,
     int num_elements_per_alloc,

ompi/class/ompi_free_list.h

@@ -27,7 +27,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-OMPI_DECLSPEC extern ompi_class_t ompi_free_list_t_class;
+OMPI_DECLSPEC extern opal_class_t ompi_free_list_t_class;
 struct mca_mem_pool_t;
 
 
@@ -39,7 +39,7 @@ struct ompi_free_list_t
     size_t fl_num_per_alloc;
     size_t fl_num_waiting;
     size_t fl_elem_size;
-    ompi_class_t* fl_elem_class;
+    opal_class_t* fl_elem_class;
     mca_mpool_base_module_t* fl_mpool;
     ompi_mutex_t fl_lock;
     ompi_condition_t fl_condition; 
@@ -59,7 +59,7 @@ typedef struct ompi_free_list_item_t ompi_free_list_item_t;
  *
  * @param free_list (IN)           Free list.
  * @param element_size (IN)        Size of each element.
- * @param element_class (IN)       ompi_class_t of element - used to initialize allocated elements.
+ * @param element_class (IN)       opal_class_t of element - used to initialize allocated elements.
  * @param num_elements_to_alloc    Initial number of elements to allocate.
  * @param max_elements_to_alloc    Maximum number of elements to allocate.
  * @param num_elements_per_alloc   Number of elements to grow by per allocation.
@@ -69,7 +69,7 @@ typedef struct ompi_free_list_item_t ompi_free_list_item_t;
 OMPI_DECLSPEC int ompi_free_list_init(
     ompi_free_list_t *free_list, 
     size_t element_size,
-    ompi_class_t* element_class,
+    opal_class_t* element_class,
     int num_elements_to_alloc,
     int max_elements_to_alloc,
     int num_elements_per_alloc,

ompi/class/ompi_pointer_array.c

@@ -30,7 +30,7 @@ static void ompi_pointer_array_construct(ompi_pointer_array_t *);
 static void ompi_pointer_array_destruct(ompi_pointer_array_t *);
 static bool grow_table(ompi_pointer_array_t *table, size_t soft, size_t hard);
 
-OBJ_CLASS_INSTANCE(ompi_pointer_array_t, ompi_object_t,
+OBJ_CLASS_INSTANCE(ompi_pointer_array_t, opal_object_t,
                    ompi_pointer_array_construct,
                    ompi_pointer_array_destruct);
 

ompi/class/ompi_pointer_array.h

@@ -32,7 +32,7 @@
 #include "ompi_config.h"
 
 #include "threads/mutex.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
@@ -43,7 +43,7 @@ extern "C" {
  */
 struct ompi_pointer_array_t {
     /** base class */
-    ompi_object_t super;
+    opal_object_t super;
     /** synchronization object */
     ompi_mutex_t lock;
     /** Index of lowest free element.  NOTE: This is only an

ompi/class/ompi_rb_tree.c

@@ -23,7 +23,7 @@
 
 /* declare the instance of the classes  */
 OBJ_CLASS_INSTANCE(ompi_rb_tree_node_t, ompi_list_item_t, NULL, NULL);
-OBJ_CLASS_INSTANCE(ompi_rb_tree_t, ompi_object_t, ompi_rb_tree_construct,
+OBJ_CLASS_INSTANCE(ompi_rb_tree_t, opal_object_t, ompi_rb_tree_construct,
                    ompi_rb_tree_destruct);
 
 /* Private functions */
@@ -43,7 +43,7 @@ static void inorder_traversal(ompi_rb_tree_t *tree,
 
 
 /* constructor */
-void ompi_rb_tree_construct(ompi_object_t * object)
+void ompi_rb_tree_construct(opal_object_t * object)
 {
     ompi_rb_tree_t * tree = (ompi_rb_tree_t *) object;
     tree->root_ptr = NULL;
@@ -54,7 +54,7 @@ void ompi_rb_tree_construct(ompi_object_t * object)
 }
 
 /* the destructor function */
-void ompi_rb_tree_destruct(ompi_object_t * object)
+void ompi_rb_tree_destruct(opal_object_t * object)
 {
     if(NULL != ((ompi_rb_tree_t *)object)->root_ptr) {
         ompi_rb_tree_destroy((ompi_rb_tree_t *) object);

ompi/class/ompi_rb_tree.h

@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 #include "include/constants.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_free_list.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
@@ -64,7 +64,7 @@ typedef int (*ompi_rb_tree_comp_fn_t)(void *key1, void *key2);
   * the data structure that holds all the needed information about the tree.
   */
 struct ompi_rb_tree_t {
-    ompi_object_t parent;           /**< the parent class */
+    opal_object_t parent;           /**< the parent class */
     /* this root pointer doesn't actually point to the root of the tree.
      * rather, it points to a sentinal node who's left branch is the real
      * root of the tree. This is done to eliminate special cases */
@@ -107,14 +107,14 @@ typedef void (*ompi_rb_tree_action_fn_t)(void *, void *);
   *
   * @retval NONE
   */
-OMPI_DECLSPEC void ompi_rb_tree_construct(ompi_object_t * object);
+OMPI_DECLSPEC void ompi_rb_tree_construct(opal_object_t * object);
 
 /**
   * the destruct function. tries to free the tree and destroys the free list
   *
   * @param object the tree object
   */
-OMPI_DECLSPEC void ompi_rb_tree_destruct(ompi_object_t * object);
+OMPI_DECLSPEC void ompi_rb_tree_destruct(opal_object_t * object);
 
 /**
   * the function creates a new tree

ompi/communicator/comm_init.c

@@ -47,7 +47,7 @@ ompi_communicator_t  *ompi_mpi_comm_parent;
 static void ompi_comm_construct(ompi_communicator_t* comm);
 static void ompi_comm_destruct(ompi_communicator_t* comm);
 
-OBJ_CLASS_INSTANCE(ompi_communicator_t,ompi_object_t,ompi_comm_construct,ompi_comm_destruct);
+OBJ_CLASS_INSTANCE(ompi_communicator_t,opal_object_t,ompi_comm_construct,ompi_comm_destruct);
 
 /* This is the counter for the number of communicators, which contain
    process with more than one jobid. This counter is a usefull 

ompi/communicator/communicator.h

@@ -17,7 +17,7 @@
 #ifndef OMPI_COMMUNICATOR_H
 #define OMPI_COMMUNICATOR_H
 
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_hash_table.h"
 #include "errhandler/errhandler.h"
 #include "threads/mutex.h"
@@ -34,7 +34,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-OMPI_DECLSPEC extern ompi_class_t ompi_communicator_t_class;
+OMPI_DECLSPEC extern opal_class_t ompi_communicator_t_class;
 
 #define OMPI_COMM_INTER      0x00000001
 #define OMPI_COMM_CART       0x00000002
@@ -89,7 +89,7 @@ OMPI_DECLSPEC extern ompi_class_t ompi_communicator_t_class;
 OMPI_DECLSPEC extern ompi_pointer_array_t ompi_mpi_communicators; 
 
 struct ompi_communicator_t {
-    ompi_object_t              c_base; 
+    opal_object_t              c_base; 
     ompi_mutex_t               c_lock; /* mutex for name and potentially 
                                           attributes */
     char  c_name[MPI_MAX_OBJECT_NAME];

ompi/datatype/convertor.c

@@ -66,7 +66,7 @@ static void ompi_convertor_destruct( ompi_convertor_t* convertor )
     ompi_convertor_cleanup( convertor );
 }
 
-OBJ_CLASS_INSTANCE(ompi_convertor_t, ompi_object_t, ompi_convertor_construct, ompi_convertor_destruct );
+OBJ_CLASS_INSTANCE(ompi_convertor_t, opal_object_t, ompi_convertor_construct, ompi_convertor_destruct );
 
 
 /* 

ompi/datatype/convertor.h

@@ -71,7 +71,7 @@ typedef struct dt_stack {
 #define DT_STATIC_STACK_SIZE   5
 
 struct ompi_convertor_t {
-    ompi_object_t                 super;        /**< basic superclass */
+    opal_object_t                 super;        /**< basic superclass */
     uint32_t                      remoteArch;   /**< the remote architecture */
     uint32_t                      flags;        /**< the properties of this convertor */
     const struct ompi_datatype_t* pDesc;        /**< the datatype description associated with the convertor */

ompi/datatype/datatype.h

@@ -35,7 +35,7 @@
 #endif
 #include <string.h>
 #include "include/constants.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_hash_table.h"
 #include "class/ompi_pointer_array.h"
 #include "mpi.h"
@@ -87,7 +87,7 @@ typedef struct dt_type_desc {
 /* the data description.
  */
 typedef struct ompi_datatype_t {
-   ompi_object_t      super;    /**< basic superclass */
+   opal_object_t      super;    /**< basic superclass */
    unsigned long      size;     /**< total size in bytes of the memory used by the data if
                                  * the data is put on a contiguous buffer */
    uint32_t           align;    /**< data should be aligned to */

ompi/datatype/dt_create.c

@@ -70,7 +70,7 @@ static void __destroy_ddt_struct( ompi_datatype_t* pData )
 
 }
 
-OBJ_CLASS_INSTANCE(ompi_datatype_t, ompi_object_t, __get_free_dt_struct, __destroy_ddt_struct );
+OBJ_CLASS_INSTANCE(ompi_datatype_t, opal_object_t, __get_free_dt_struct, __destroy_ddt_struct );
 
 ompi_datatype_t* ompi_ddt_create( int32_t expectedSize )
 {

ompi/errhandler/errclass.c

@@ -86,7 +86,7 @@ ompi_errclass_t ompi_errclass_win;
 static void ompi_errclass_construct(ompi_errclass_t* errcode);
 static void ompi_errclass_destruct(ompi_errclass_t* errcode);
 
-OBJ_CLASS_INSTANCE(ompi_errclass_t,ompi_object_t,ompi_errclass_construct, ompi_errclass_destruct);
+OBJ_CLASS_INSTANCE(ompi_errclass_t,opal_object_t,ompi_errclass_construct, ompi_errclass_destruct);
 
 int ompi_errclass_init (void)
 {

ompi/errhandler/errclass.h

@@ -21,7 +21,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_pointer_array.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
@@ -33,7 +33,7 @@ extern "C" {
  * to trivial.
  */
 struct ompi_errclass_t {
-    ompi_object_t                      super;
+    opal_object_t                      super;
     int                                cls;
 };
 typedef struct ompi_errclass_t ompi_errclass_t;

ompi/errhandler/errcode-internal.c

@@ -49,7 +49,7 @@ static ompi_errcode_intern_t ompi_err_buffer;
 static void ompi_errcode_intern_construct(ompi_errcode_intern_t* errcode);
 static void ompi_errcode_intern_destruct(ompi_errcode_intern_t* errcode);
 
-OBJ_CLASS_INSTANCE(ompi_errcode_intern_t,ompi_object_t,ompi_errcode_intern_construct, ompi_errcode_intern_destruct);
+OBJ_CLASS_INSTANCE(ompi_errcode_intern_t,opal_object_t,ompi_errcode_intern_construct, ompi_errcode_intern_destruct);
 
 int ompi_errcode_intern_init (void)
 {

ompi/errhandler/errcode-internal.h

@@ -22,7 +22,7 @@
 
 #include "mpi.h"
 #include "include/constants.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_pointer_array.h"
 
 #define OMPI_MAX_ERROR_STRING 64
@@ -33,7 +33,7 @@ extern "C" {
  * Back-end type for MPI error codes
  */
 struct ompi_errcode_intern_t {
-    ompi_object_t                       super;
+    opal_object_t                       super;
     int                                  code;
     int                              mpi_code;
     int                                 index;

ompi/errhandler/errcode.c

@@ -87,7 +87,7 @@ ompi_mpi_errcode_t ompi_err_win;
 static void ompi_mpi_errcode_construct(ompi_mpi_errcode_t* errcode);
 static void ompi_mpi_errcode_destruct(ompi_mpi_errcode_t* errcode);
 
-OBJ_CLASS_INSTANCE(ompi_mpi_errcode_t,ompi_object_t,ompi_mpi_errcode_construct, ompi_mpi_errcode_destruct);
+OBJ_CLASS_INSTANCE(ompi_mpi_errcode_t,opal_object_t,ompi_mpi_errcode_construct, ompi_mpi_errcode_destruct);
 
 int ompi_mpi_errcode_init (void)
 {

ompi/errhandler/errcode.h

@@ -21,7 +21,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_pointer_array.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
@@ -32,7 +32,7 @@ extern "C" {
  * Back-end type for MPI error codes
  */
 struct ompi_mpi_errcode_t {
-    ompi_object_t                      super;
+    opal_object_t                      super;
     int                                 code;
     int                                cls;
     char     errstring[MPI_MAX_ERROR_STRING];

ompi/errhandler/errhandler.c

@@ -40,7 +40,7 @@ static void ompi_errhandler_destruct(ompi_errhandler_t *eh);
 /*
  * Class instance
  */
-OBJ_CLASS_INSTANCE(ompi_errhandler_t, ompi_object_t, ompi_errhandler_construct,
+OBJ_CLASS_INSTANCE(ompi_errhandler_t, opal_object_t, ompi_errhandler_construct,
                    ompi_errhandler_destruct);
 
 

ompi/errhandler/errhandler.h

@@ -21,7 +21,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_pointer_array.h"
 #include "ompi/runtime/mpiruntime.h"
 #include "errhandler/errhandler_predefined.h"
@@ -68,7 +68,7 @@ typedef enum ompi_errhandler_type_t ompi_errhandler_type_t;
  * Back-end type for MPI_Errorhandler.
  */
 struct ompi_errhandler_t {
-    ompi_object_t super;
+    opal_object_t super;
 
     char eh_name[MPI_MAX_OBJECT_NAME];
     /* Type of MPI object that this handler is for */

ompi/file/file.c

@@ -45,7 +45,7 @@ static void file_destructor(ompi_file_t *obj);
  * Class instance for ompi_file_t
  */
 OBJ_CLASS_INSTANCE(ompi_file_t,
-                   ompi_object_t,
+                   opal_object_t,
                    file_constructor,
                    file_destructor);
 

ompi/file/file.h

@@ -38,7 +38,7 @@ extern "C" {
  */
 struct ompi_file_t {
     /** Base of OBJ_* interface */
-    ompi_object_t super;
+    opal_object_t super;
 
     /** Communicator that this file was created with */
     struct ompi_communicator_t *f_comm;

ompi/group/group.h

@@ -33,7 +33,7 @@ extern "C" {
  * Group structure
  */
 struct ompi_group_t {
-    ompi_object_t super;    /**< base class */
+    opal_object_t super;    /**< base class */
     int grp_proc_count;     /**< number of processes in group */
     int grp_my_rank;        /**< rank in group */
     int grp_f_to_c_index;   /**< index in Fortran <-> C translation array */

ompi/group/group_init.c

@@ -24,7 +24,7 @@ static void ompi_group_construct(ompi_group_t *);
 static void ompi_group_destruct(ompi_group_t *);
 
 OBJ_CLASS_INSTANCE(ompi_group_t,
-                   ompi_object_t,
+                   opal_object_t,
                    ompi_group_construct,
                    ompi_group_destruct);
 

ompi/mca/allocator/basic/allocator_basic.h

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "threads/mutex.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_free_list.h"
 #include "mca/allocator/allocator.h"
 

ompi/mca/allocator/bucket/allocator_bucket_alloc.h

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "threads/mutex.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "mca/allocator/allocator.h"
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {

ompi/mca/btl/gm/btl_gm_proc.h

@@ -18,7 +18,7 @@
 #define MCA_BTL_GM_PROC_H
 
 #include "mca/ns/ns.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "proc/proc.h"
 #include "btl_gm.h"
 #include "btl_gm_endpoint.h"

ompi/mca/btl/mvapi/btl_mvapi_proc.h

@@ -18,7 +18,7 @@
 #define MCA_BTL_IB_PROC_H
 
 #include "mca/ns/ns.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "proc/proc.h"
 #include "btl_mvapi.h"
 #include "btl_mvapi_endpoint.h"

ompi/mca/btl/openib/btl_openib_proc.h

@@ -18,7 +18,7 @@
 #define MCA_BTL_IB_PROC_H
 
 #include "mca/ns/ns.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "proc/proc.h"
 #include "btl_openib.h"
 #include "btl_openib_endpoint.h"

ompi/mca/btl/sm/btl_sm.h

@@ -330,7 +330,7 @@ typedef struct mca_btl_sm_exchange{
 }mca_btl_sm_exchange_t;
 
 #if OMPI_ENABLE_PROGRESS_THREADS == 1
-void mca_btl_sm_component_event_thread(ompi_object_t*);
+void mca_btl_sm_component_event_thread(opal_object_t*);
 #endif
                                                                                                               
 #if OMPI_ENABLE_PROGRESS_THREADS == 1 

ompi/mca/btl/sm/btl_sm_component.c

@@ -296,7 +296,7 @@ mca_btl_base_module_t** mca_btl_sm_component_init(
  */
 
 #if OMPI_ENABLE_PROGRESS_THREADS == 1
-void mca_btl_sm_component_event_thread(ompi_object_t* thread)
+void mca_btl_sm_component_event_thread(opal_object_t* thread)
 {
     while(1) {
         unsigned char cmd;

ompi/mca/btl/template/btl_template_proc.h

@@ -18,7 +18,7 @@
 #define MCA_BTL_TEMPLATE_PROC_H
 
 #include "mca/ns/ns.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "proc/proc.h"
 #include "btl_template.h"
 #include "btl_template_endpoint.h"

ompi/mca/coll/base/coll_base_comm_select.c

@@ -25,7 +25,7 @@
 #include "util/argv.h"
 #include "util/show_help.h"
 #include "class/ompi_list.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/coll/coll.h"

ompi/mca/common/sm/common_sm_mmap.c

@@ -40,7 +40,7 @@
 
 OBJ_CLASS_INSTANCE(
     mca_common_sm_mmap_t,
-    ompi_object_t,
+    opal_object_t,
     NULL,
     NULL
 );

ompi/mca/common/sm/common_sm_mmap.h

@@ -19,7 +19,7 @@
 
 #include "ompi_config.h"
 
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_list.h"
 #include "include/sys/atomic.h"
 #include "mca/mpool/mpool.h" 

ompi/mca/io/base/io_base_file_select.c

@@ -25,7 +25,7 @@
 #include "util/argv.h"
 #include "util/output.h"
 #include "class/ompi_list.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/io/io.h"

ompi/mca/io/base/io_base_request.c

@@ -20,7 +20,7 @@
 #include <sys/time.h>
 #endif
 
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "file/file.h"
 #include "mca/base/base.h"
 #include "mca/base/mca_base_param.h"
@@ -238,7 +238,7 @@ static ompi_mutex_t progress_mutex;
 static ompi_condition_t progress_cond;
 
 static void*
-request_progress_thread(ompi_object_t *arg)
+request_progress_thread(opal_object_t *arg)
 {
     struct timespec abstime;
     struct timeval tv;

ompi/mca/io/base/io_base_request.h

@@ -22,7 +22,7 @@
 #ifndef IO_BASE_REQUEST_H
 #define IO_BASE_REQUEST_H
 
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "request/request.h"
 #include "file/file.h"
 #include "mca/io/base/base.h"

ompi/mca/pml/base/pml_base_module_exchange.c

@@ -82,7 +82,7 @@ OBJ_CLASS_INSTANCE(
  * received from peers.
  */
 struct mca_base_modex_t {
-    ompi_object_t super;
+    opal_object_t super;
     ompi_list_t modex_modules;
 };
 typedef struct mca_base_modex_t mca_base_modex_t;
@@ -99,7 +99,7 @@ static void mca_base_modex_destruct(mca_base_modex_t* modex)
 
 OBJ_CLASS_INSTANCE(
     mca_base_modex_t, 
-    ompi_object_t, 
+    opal_object_t, 
     mca_base_modex_construct, 
     mca_base_modex_destruct
 );

ompi/mca/pml/base/pml_base_recvreq.c

@@ -25,11 +25,11 @@ static void mca_pml_base_recv_request_construct(mca_pml_base_recv_request_t*);
 static void mca_pml_base_recv_request_destruct(mca_pml_base_recv_request_t*);
 
 
-ompi_class_t mca_pml_base_recv_request_t_class = { 
+opal_class_t mca_pml_base_recv_request_t_class = { 
     "mca_pml_base_recv_request_t", 
     OBJ_CLASS(mca_pml_base_request_t),
-    (ompi_construct_t) mca_pml_base_recv_request_construct, 
+    (opal_construct_t) mca_pml_base_recv_request_construct, 
-    (ompi_destruct_t) mca_pml_base_recv_request_destruct 
+    (opal_destruct_t) mca_pml_base_recv_request_destruct 
 };
                                                                                                  
 

ompi/mca/pml/base/pml_base_request.c

@@ -28,11 +28,11 @@ static void mca_pml_base_request_destruct(mca_pml_base_request_t* req)
 {
 }
 
-ompi_class_t mca_pml_base_request_t_class = { 
+opal_class_t mca_pml_base_request_t_class = { 
     "mca_pml_base_request_t", 
     OBJ_CLASS(ompi_request_t),
-    (ompi_construct_t) mca_pml_base_request_construct, 
+    (opal_construct_t) mca_pml_base_request_construct, 
-    (ompi_destruct_t) mca_pml_base_request_destruct 
+    (opal_destruct_t) mca_pml_base_request_destruct 
 };
                                                                                                  
 

ompi/mca/pml/base/pml_base_request.h

@@ -26,7 +26,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-OMPI_DECLSPEC extern ompi_class_t mca_pml_base_request_t_class;
+OMPI_DECLSPEC extern opal_class_t mca_pml_base_request_t_class;
 
 /**
  * Type of request.

ompi/mca/pml/base/pml_base_sendreq.c

@@ -22,11 +22,11 @@ static void mca_pml_base_send_request_construct(mca_pml_base_send_request_t* req
 static void mca_pml_base_send_request_destruct(mca_pml_base_send_request_t* req);
 
 
-ompi_class_t mca_pml_base_send_request_t_class = { 
+opal_class_t mca_pml_base_send_request_t_class = { 
     "mca_pml_base_send_request_t", 
     OBJ_CLASS(mca_pml_base_request_t),
-    (ompi_construct_t) mca_pml_base_send_request_construct, 
+    (opal_construct_t) mca_pml_base_send_request_construct, 
-    (ompi_destruct_t) mca_pml_base_send_request_destruct 
+    (opal_destruct_t) mca_pml_base_send_request_destruct 
 };
 
 

ompi/mca/pml/base/pml_base_sendreq.h

@@ -28,7 +28,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-OMPI_DECLSPEC extern ompi_class_t mca_pml_base_send_request_t_class;
+OMPI_DECLSPEC extern opal_class_t mca_pml_base_send_request_t_class;
 
 
 /**

ompi/mca/pml/ob1/pml_ob1_comm.c

@@ -41,7 +41,7 @@ static void mca_pml_ob1_comm_proc_destruct(mca_pml_ob1_comm_proc_t* proc)
 
 static OBJ_CLASS_INSTANCE(
     mca_pml_ob1_comm_proc_t,
-    ompi_object_t,
+    opal_object_t,
     mca_pml_ob1_comm_proc_construct,
     mca_pml_ob1_comm_proc_destruct);
 
@@ -70,7 +70,7 @@ static void mca_pml_ob1_comm_destruct(mca_pml_ob1_comm_t* comm)
 
 OBJ_CLASS_INSTANCE(
     mca_pml_ob1_comm_t,
-    ompi_object_t,
+    opal_object_t,
     mca_pml_ob1_comm_construct,
     mca_pml_ob1_comm_destruct);
 

ompi/mca/pml/ob1/pml_ob1_comm.h

@@ -29,7 +29,7 @@ extern "C" {
 
 
 struct mca_pml_ob1_comm_proc_t {
-     ompi_object_t super;
+     opal_object_t super;
      uint16_t expected_sequence;    /**< send message sequence number - receiver side */
      ompi_list_t frags_cant_match;  /**< out-of-order fragment queues */
      ompi_list_t specific_receives; /**< queues of unmatched specific receives */
@@ -43,7 +43,7 @@ typedef struct mca_pml_ob1_comm_proc_t mca_pml_ob1_comm_proc_t;
  *  used by the PML<->PTL interface for matching logic. 
  */
 struct mca_pml_comm_t {
-    ompi_object_t super;
+    opal_object_t super;
     mca_ptl_sequence_t recv_sequence;  /**< recv request sequence number - receiver side */
     ompi_mutex_t matching_lock;   /**< matching lock */
     ompi_list_t wild_receives;    /**< queue of unmatched wild (source process not specified) receives */

ompi/mca/pml/ob1/pml_ob1_endpoint.c

@@ -39,7 +39,7 @@ static void mca_pml_ob1_ep_array_destruct(mca_pml_ob1_ep_array_t* array)
 
 OBJ_CLASS_INSTANCE(
     mca_pml_ob1_ep_array_t,
-    ompi_object_t,
+    opal_object_t,
     mca_pml_ob1_ep_array_construct,
     mca_pml_ob1_ep_array_destruct
 );

ompi/mca/pml/ob1/pml_ob1_endpoint.h

@@ -60,7 +60,7 @@ typedef struct mca_pml_ob1_endpoint_t mca_pml_ob1_endpoint_t;
  * scheduling across contents.
  */
 struct mca_pml_ob1_ep_array_t {
-    ompi_object_t super;
+    opal_object_t super;
     size_t arr_size;    /**< number available */
     size_t arr_reserve; /**< size of allocated btl_proc array */
     size_t arr_index;   /**< last used index*/

ompi/mca/pml/ob1/pml_ob1_proc.c

@@ -43,7 +43,7 @@ static void mca_pml_ob1_proc_destruct(mca_pml_ob1_proc_t* proc)
 
 OBJ_CLASS_INSTANCE(
     mca_pml_ob1_proc_t,
-    ompi_object_t,
+    opal_object_t,
     mca_pml_ob1_proc_construct, 
     mca_pml_ob1_proc_destruct 
 );

ompi/mca/pml/ob1/pml_ob1_proc.h

@@ -33,7 +33,7 @@ extern "C" {
  *  to the PML.
  */
 struct mca_pml_proc_t {
-   ompi_object_t super;
+   opal_object_t super;
    ompi_proc_t *proc_ompi;             /**< back-pointer to ompi_proc_t */
    ompi_mutex_t proc_lock;             /**< lock to protect against concurrent access */
    int proc_flags;                     /**< prefered method of accessing this peer */

ompi/mca/pml/teg/pml_ptl_array.c

@@ -39,7 +39,7 @@ static void mca_ptl_array_destruct(mca_ptl_array_t* array)
 
 OBJ_CLASS_INSTANCE(
     mca_pml_teg_ptl_array_t,
-    ompi_object_t,
+    opal_object_t,
     mca_ptl_array_construct,
     mca_ptl_array_destruct
 );

ompi/mca/pml/teg/pml_ptl_array.h

@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-extern ompi_class_t mca_pml_teg_ptl_array_t_class;
+extern opal_class_t mca_pml_teg_ptl_array_t_class;
 
 /**
  * A data structure associated with a ompi_proc_t that caches
@@ -46,7 +46,7 @@ typedef struct mca_ptl_proc_t mca_ptl_proc_t;
  * scheduling across contents.
  */
 struct mca_ptl_array_t {
-    ompi_object_t     super;
+    opal_object_t     super;
     mca_ptl_proc_t*  ptl_procs;   /**< array of ptl procs */
     size_t           ptl_size;    /**< number available */
     size_t           ptl_reserve; /**< size of allocated ptl_proc array */

ompi/mca/pml/teg/pml_teg_proc.h

@@ -43,7 +43,7 @@ struct mca_pml_proc_t {
 typedef struct mca_pml_proc_t mca_pml_proc_t;
 
 
-OMPI_COMP_EXPORT extern ompi_class_t mca_pml_teg_proc_t_class;
+OMPI_COMP_EXPORT extern opal_class_t mca_pml_teg_proc_t_class;
 typedef struct mca_pml_proc_t mca_pml_teg_proc_t;
 
 /**

ompi/mca/pml/teg/pml_teg_recvfrag.c

@@ -25,7 +25,7 @@
 #include "pml_teg_proc.h"
 
 
-OMPI_DECLSPEC extern ompi_class_t mca_ptl_base_recv_frag_t_class;
+OMPI_DECLSPEC extern opal_class_t mca_ptl_base_recv_frag_t_class;
 
 
 /**

ompi/mca/pml/uniq/pml_uniq_proc.h

@@ -62,7 +62,7 @@ extern "C" {
    typedef struct mca_pml_proc_t mca_pml_proc_t;
 
 
-   OMPI_COMP_EXPORT extern ompi_class_t mca_pml_uniq_proc_t_class;
+   OMPI_COMP_EXPORT extern opal_class_t mca_pml_uniq_proc_t_class;
    typedef struct mca_pml_proc_t mca_pml_uniq_proc_t;
 
    /**

ompi/mca/pml/uniq/pml_uniq_recvfrag.c

@@ -25,7 +25,7 @@
 #include "pml_uniq_proc.h"
 
 
-OMPI_DECLSPEC extern ompi_class_t mca_ptl_base_recv_frag_t_class;
+OMPI_DECLSPEC extern opal_class_t mca_ptl_base_recv_frag_t_class;
 
 
 /**

ompi/mca/ptl/base/ptl_base_comm.c

@@ -24,11 +24,11 @@ static void mca_pml_ptl_comm_construct(mca_pml_ptl_comm_t* comm);
 static void mca_pml_ptl_comm_destruct(mca_pml_ptl_comm_t* comm);
 
 
-ompi_class_t mca_pml_ptl_comm_t_class = {
+opal_class_t mca_pml_ptl_comm_t_class = {
     "mca_pml_ptl_comm_t",
-    OBJ_CLASS(ompi_object_t),
+    OBJ_CLASS(opal_object_t),
-    (ompi_construct_t)mca_pml_ptl_comm_construct,
+    (opal_construct_t)mca_pml_ptl_comm_construct,
-    (ompi_destruct_t)mca_pml_ptl_comm_destruct
+    (opal_destruct_t)mca_pml_ptl_comm_destruct
 };
 
 

ompi/mca/ptl/base/ptl_base_comm.h

@@ -26,14 +26,14 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-OMPI_DECLSPEC extern ompi_class_t mca_pml_ptl_comm_t_class;
+OMPI_DECLSPEC extern opal_class_t mca_pml_ptl_comm_t_class;
 
 /**
  *  Cached on ompi_communicator_t to hold queues/state
  *  used by the PML<->PTL interface for matching logic. 
  */
 struct mca_pml_comm_t {
-    ompi_object_t super;
+    opal_object_t super;
     uint32_t *c_msg_seq;               /**< send message sequence number - sender side */
     uint16_t *c_next_msg_seq;          /**< send message sequence number - receiver side */
     mca_ptl_sequence_t c_recv_seq;     /**< recv request sequence number - receiver side */

ompi/mca/ptl/base/ptl_base_fragment.c

@@ -23,11 +23,11 @@ static void mca_ptl_base_frag_construct(mca_ptl_base_frag_t* frag);
 static void mca_ptl_base_frag_destruct(mca_ptl_base_frag_t* frag);
 
 
-ompi_class_t mca_ptl_base_frag_t_class = { 
+opal_class_t mca_ptl_base_frag_t_class = { 
     "mca_ptl_base_frag_t", 
     OBJ_CLASS(ompi_list_item_t),
-    (ompi_construct_t) mca_ptl_base_frag_construct, 
+    (opal_construct_t) mca_ptl_base_frag_construct, 
-    (ompi_destruct_t) mca_ptl_base_frag_destruct 
+    (opal_destruct_t) mca_ptl_base_frag_destruct 
 };
 
 static void mca_ptl_base_frag_construct(mca_ptl_base_frag_t* frag)

ompi/mca/ptl/base/ptl_base_recvfrag.h

@@ -27,7 +27,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-OMPI_DECLSPEC extern ompi_class_t mca_ptl_base_recv_frag_t_class;
+OMPI_DECLSPEC extern opal_class_t mca_ptl_base_recv_frag_t_class;
 
 /**
  * Base type for receive fragment descriptors.

ompi/mca/ptl/base/ptl_base_sendfrag.c

@@ -23,11 +23,11 @@ static void mca_ptl_base_send_frag_construct(mca_ptl_base_send_frag_t* frag);
 static void mca_ptl_base_send_frag_destruct(mca_ptl_base_send_frag_t* frag);
 
 
-ompi_class_t mca_ptl_base_send_frag_t_class = { 
+opal_class_t mca_ptl_base_send_frag_t_class = { 
     "mca_ptl_base_send_frag_t", 
     OBJ_CLASS(mca_ptl_base_frag_t),
-    (ompi_construct_t) mca_ptl_base_send_frag_construct, 
+    (opal_construct_t) mca_ptl_base_send_frag_construct, 
-    (ompi_destruct_t) mca_ptl_base_send_frag_destruct 
+    (opal_destruct_t) mca_ptl_base_send_frag_destruct 
 };
                                                                                                  
 

ompi/mca/ptl/base/ptl_base_sendfrag.h

@@ -25,7 +25,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-OMPI_DECLSPEC extern ompi_class_t mca_ptl_base_send_frag_t_class;
+OMPI_DECLSPEC extern opal_class_t mca_ptl_base_send_frag_t_class;
 
 /**
  * Base type for send fragment descriptors 

ompi/mca/ptl/elan/src/ptl_elan_frag.c

@@ -49,11 +49,11 @@ mca_ptl_elan_send_frag_destruct (mca_ptl_elan_send_frag_t * frag)
     /* Nothing to do then */
 }
 
-ompi_class_t mca_ptl_elan_send_frag_t_class = {
+opal_class_t mca_ptl_elan_send_frag_t_class = {
     "mca_ptl_elan_send_frag_t",
     OBJ_CLASS (mca_ptl_base_frag_t),
-    (ompi_construct_t) mca_ptl_elan_send_frag_construct,
+    (opal_construct_t) mca_ptl_elan_send_frag_construct,
-    (ompi_destruct_t) mca_ptl_elan_send_frag_destruct
+    (opal_destruct_t) mca_ptl_elan_send_frag_destruct
 };
 
 static void
@@ -86,11 +86,11 @@ mca_ptl_elan_recv_frag_destruct (mca_ptl_elan_recv_frag_t * frag)
     frag->unex_buff = NULL;
 }
 
-ompi_class_t mca_ptl_elan_recv_frag_t_class = {
+opal_class_t mca_ptl_elan_recv_frag_t_class = {
     "mca_ptl_elan_recv_frag_t",
     OBJ_CLASS (mca_ptl_base_recv_frag_t),
-    (ompi_construct_t) mca_ptl_elan_recv_frag_construct,
+    (opal_construct_t) mca_ptl_elan_recv_frag_construct,
-    (ompi_destruct_t) mca_ptl_elan_recv_frag_destruct
+    (opal_destruct_t) mca_ptl_elan_recv_frag_destruct
 };
 
 

ompi/mca/ptl/elan/src/ptl_elan_frag.h

@@ -63,8 +63,8 @@ struct mca_ptl_elan_recv_frag_t {
 };
 typedef struct mca_ptl_elan_recv_frag_t mca_ptl_elan_recv_frag_t;
 
-extern ompi_class_t mca_ptl_elan_send_frag_t_class;
+extern opal_class_t mca_ptl_elan_send_frag_t_class;
-extern ompi_class_t mca_ptl_elan_recv_frag_t_class;
+extern opal_class_t mca_ptl_elan_recv_frag_t_class;
 
 mca_ptl_elan_send_frag_t *
 mca_ptl_elan_alloc_desc(struct mca_ptl_base_module_t *ptl,

ompi/mca/ptl/elan/src/ptl_elan_peer.c

@@ -44,9 +44,9 @@ mca_ptl_elan_peer_destruct (mca_ptl_elan_peer_t * ptl_peer)
     /*mca_ptl_elan_peer_close(ptl_peer); */
 }
 
-ompi_class_t mca_ptl_elan_peer_t_class = {
+opal_class_t mca_ptl_elan_peer_t_class = {
     "mca_elan_ptl_peer_t",
     OBJ_CLASS (ompi_list_item_t),
-    (ompi_construct_t) mca_ptl_elan_peer_construct,
+    (opal_construct_t) mca_ptl_elan_peer_construct,
-    (ompi_destruct_t) mca_ptl_elan_peer_destruct
+    (opal_destruct_t) mca_ptl_elan_peer_destruct
 };

ompi/mca/ptl/elan/src/ptl_elan_proc.c

@@ -31,11 +31,11 @@ static void mca_ptl_elan_proc_destruct (mca_ptl_elan_proc_t * proc);
 static mca_ptl_elan_proc_t *mca_ptl_elan_proc_lookup_ompi (ompi_proc_t *
                                                            ompi_proc);
 
-ompi_class_t mca_ptl_elan_proc_t_class = {
+opal_class_t mca_ptl_elan_proc_t_class = {
     "mca_ptl_elan_proc_t",
     OBJ_CLASS (ompi_list_item_t),
-    (ompi_construct_t) mca_ptl_elan_proc_construct,
+    (opal_construct_t) mca_ptl_elan_proc_construct,
-    (ompi_destruct_t) mca_ptl_elan_proc_destruct
+    (opal_destruct_t) mca_ptl_elan_proc_destruct
 };
 
 

ompi/mca/ptl/elan/src/ptl_elan_proc.h

@@ -22,14 +22,14 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "proc/proc.h"
 #include "ptl_elan.h"
 #include "ptl_elan_peer.h"
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-extern ompi_class_t mca_ptl_elan_proc_t_class;
+extern opal_class_t mca_ptl_elan_proc_t_class;
 
 /**
  *  Represents the state of a remote process. Also cache an instance 

ompi/mca/ptl/gm/ptl_gm_proc.c

@@ -35,11 +35,11 @@ static void mca_ptl_gm_proc_destruct (mca_ptl_gm_proc_t * proc);
 static mca_ptl_gm_proc_t *mca_ptl_gm_proc_lookup_ompi (ompi_proc_t *
                                                        ompi_proc);
 
-ompi_class_t mca_ptl_gm_proc_t_class = {
+opal_class_t mca_ptl_gm_proc_t_class = {
     "mca_ptl_gm_proc_t",
     OBJ_CLASS (ompi_list_item_t),
-    (ompi_construct_t) mca_ptl_gm_proc_construct,
+    (opal_construct_t) mca_ptl_gm_proc_construct,
-    (ompi_destruct_t) mca_ptl_gm_proc_destruct
+    (opal_destruct_t) mca_ptl_gm_proc_destruct
 };
 
 

ompi/mca/ptl/gm/ptl_gm_proc.h

@@ -23,13 +23,13 @@
 #ifndef MCA_PTL_GM_PROC_H
 #define MCA_PTL_GM_PROC_H
 
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "ptl_gm.h"
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
 
-extern ompi_class_t mca_ptl_gm_proc_t_class;
+extern opal_class_t mca_ptl_gm_proc_t_class;
 
 struct mca_ptl_gm_proc_t {
     ompi_list_item_t super;                 /**< allow proc to be placed on a list */

ompi/mca/ptl/mx/ptl_mx_module.c

@@ -120,7 +120,7 @@ int mca_ptl_mx_module_init(void)
 
 #if OMPI_ENABLE_PROGRESS_THREADS
 
-static void* mca_ptl_mx_thread(ompi_object_t *arg)
+static void* mca_ptl_mx_thread(opal_object_t *arg)
 {
     ompi_thread_t* thr = (ompi_thread_t*)arg;
     mca_ptl_mx_module_t* ptl = thr->t_arg;

ompi/mca/ptl/mx/ptl_mx_proc.h

@@ -22,7 +22,7 @@
 #include "ompi_config.h"
 #include <myriexpress.h>
 #include "mca/ns/ns.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "proc/proc.h"
 #include "ptl_mx.h"
 #include "ptl_mx_peer.h"

ompi/mca/ptl/prof/ptl_prof.c

@@ -159,7 +159,7 @@ static void ptl_prof_destruct(mca_ptl_prof_t* ptl)
    /* deregistering the profiling ids from the profiling layer */
 }
 
-OBJ_CLASS_INSTANCE( mca_ptl_prof_t, ompi_object_t,
+OBJ_CLASS_INSTANCE( mca_ptl_prof_t, opal_object_t,
                     ptl_prof_construct,
                     ptl_prof_destruct );
 

ompi/mca/ptl/sm/src/ptl_sm.h

@@ -424,7 +424,7 @@ typedef struct mca_ptl_sm_exchange{
 }mca_ptl_sm_exchange_t;
 
 #if OMPI_ENABLE_PROGRESS_THREADS == 1
-void mca_ptl_sm_component_event_thread(ompi_object_t*);
+void mca_ptl_sm_component_event_thread(opal_object_t*);
 #endif
                                                                                                               
 #if OMPI_ENABLE_PROGRESS_THREADS == 1 

ompi/mca/ptl/sm/src/ptl_sm_component.c

@@ -335,7 +335,7 @@ int mca_ptl_sm_component_control(int param, void* value, size_t size)
  */
 
 #if OMPI_ENABLE_PROGRESS_THREADS == 1
-void mca_ptl_sm_component_event_thread(ompi_object_t* thread)
+void mca_ptl_sm_component_event_thread(opal_object_t* thread)
 {
     while(1) {
         unsigned char cmd;

ompi/mca/ptl/tcp/ptl_tcp_peer.c

@@ -66,11 +66,11 @@ static void mca_ptl_tcp_peer_send_handler(int sd, short flags, void* user);
 #define WANT_PEER_DUMP 0
 
 
-ompi_class_t  mca_ptl_tcp_peer_t_class = {
+opal_class_t  mca_ptl_tcp_peer_t_class = {
     "mca_tcp_ptl_peer_t", 
     OBJ_CLASS(ompi_list_item_t),
-    (ompi_construct_t)mca_ptl_tcp_peer_construct, 
+    (opal_construct_t)mca_ptl_tcp_peer_construct, 
-    (ompi_destruct_t)mca_ptl_tcp_peer_destruct
+    (opal_destruct_t)mca_ptl_tcp_peer_destruct
 };
 
 /*

ompi/mca/ptl/tcp/ptl_tcp_peer.h

@@ -75,7 +75,7 @@ struct mca_ptl_base_peer_t {
 };
 typedef struct mca_ptl_base_peer_t mca_ptl_base_peer_t;
 
-extern ompi_class_t mca_ptl_tcp_peer_t_class;
+extern opal_class_t mca_ptl_tcp_peer_t_class;
 typedef struct mca_ptl_base_peer_t mca_ptl_tcp_peer_t;
 
 void mca_ptl_tcp_set_socket_options(int sd);

ompi/mca/ptl/tcp/ptl_tcp_proc.h

@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #endif
 #include "mca/ns/ns_types.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "proc/proc.h"
 #include "ptl_tcp.h"
 #include "ptl_tcp_peer.h"

ompi/mca/ptl/tcp/ptl_tcp_recvfrag.c

@@ -39,11 +39,11 @@ static bool mca_ptl_tcp_recv_frag_data(mca_ptl_tcp_recv_frag_t* frag, int sd);
 static bool mca_ptl_tcp_recv_frag_discard(mca_ptl_tcp_recv_frag_t* frag, int sd);
 
 
-ompi_class_t  mca_ptl_tcp_recv_frag_t_class = {
+opal_class_t  mca_ptl_tcp_recv_frag_t_class = {
     "mca_ptl_tcp_recv_frag_t",
     OBJ_CLASS(mca_ptl_base_recv_frag_t),
-    (ompi_construct_t)mca_ptl_tcp_recv_frag_construct,
+    (opal_construct_t)mca_ptl_tcp_recv_frag_construct,
-    (ompi_destruct_t)mca_ptl_tcp_recv_frag_destruct
+    (opal_destruct_t)mca_ptl_tcp_recv_frag_destruct
 };
                                                                                                            
 

ompi/mca/ptl/tcp/ptl_tcp_recvfrag.h

@@ -38,7 +38,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-extern ompi_class_t mca_ptl_tcp_recv_frag_t_class;
+extern opal_class_t mca_ptl_tcp_recv_frag_t_class;
 
 /**
  *  TCP received fragment derived type.

ompi/mca/ptl/tcp/ptl_tcp_sendfrag.c

@@ -39,11 +39,11 @@ static void mca_ptl_tcp_send_frag_construct(mca_ptl_tcp_send_frag_t* frag);
 static void mca_ptl_tcp_send_frag_destruct(mca_ptl_tcp_send_frag_t* frag);
 
 
-ompi_class_t  mca_ptl_tcp_send_frag_t_class = {
+opal_class_t  mca_ptl_tcp_send_frag_t_class = {
     "mca_ptl_tcp_send_frag_t",
     OBJ_CLASS(mca_ptl_base_send_frag_t),
-    (ompi_construct_t)mca_ptl_tcp_send_frag_construct,
+    (opal_construct_t)mca_ptl_tcp_send_frag_construct,
-    (ompi_destruct_t)mca_ptl_tcp_send_frag_destruct
+    (opal_destruct_t)mca_ptl_tcp_send_frag_destruct
 };
                                                                                                            
 /*

ompi/mca/ptl/tcp/ptl_tcp_sendfrag.h

@@ -37,7 +37,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-extern ompi_class_t mca_ptl_tcp_send_frag_t_class;
+extern opal_class_t mca_ptl_tcp_send_frag_t_class;
 struct mca_ptl_base_peer_t;
 
 

ompi/mca/ptl/tcp/ptl_tcp_sendreq.c

@@ -31,11 +31,11 @@ static void mca_ptl_tcp_send_request_construct(mca_ptl_tcp_send_request_t*);
 static void mca_ptl_tcp_send_request_destruct(mca_ptl_tcp_send_request_t*);
                                                                                                                 
 
-ompi_class_t  mca_ptl_tcp_send_request_t_class = {
+opal_class_t  mca_ptl_tcp_send_request_t_class = {
     "mca_ptl_tcp_send_request_t",
     OBJ_CLASS(mca_ptl_base_send_request_t),
-    (ompi_construct_t)mca_ptl_tcp_send_request_construct,
+    (opal_construct_t)mca_ptl_tcp_send_request_construct,
-    (ompi_destruct_t)mca_ptl_tcp_send_request_destruct
+    (opal_destruct_t)mca_ptl_tcp_send_request_destruct
 };
 
 

ompi/mca/ptl/tcp/ptl_tcp_sendreq.h

@@ -35,7 +35,7 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-extern ompi_class_t mca_ptl_tcp_send_request_t_class;
+extern opal_class_t mca_ptl_tcp_send_request_t_class;
 /**
  * TCP send request derived type. The send request contains both the
  * base send request, and space for the first TCP send fragment descriptor.

ompi/mpi/c/pack.c

@@ -24,7 +24,7 @@
 #include "datatype/convertor.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Pack = PMPI_Pack

ompi/mpi/c/pack_external.c

@@ -22,7 +22,7 @@
 #include "datatype/convertor.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Pack_external = PMPI_Pack_external

ompi/mpi/c/pack_external_size.c

@@ -18,7 +18,7 @@
 
 #include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
 #include "datatype/datatype.h"

ompi/mpi/c/pack_size.c

@@ -18,7 +18,7 @@
 
 #include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
 #include "datatype/datatype.h"

ompi/mpi/c/unpack.c

@@ -22,7 +22,7 @@
 #include "datatype/convertor.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Unpack = PMPI_Unpack

ompi/mpi/c/unpack_external.c

@@ -21,7 +21,7 @@
 #include "datatype/convertor.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Unpack_external = PMPI_Unpack_external

ompi/op/op.c

@@ -45,7 +45,7 @@ static void ompi_op_destruct(ompi_op_t *eh);
 /*
  * Class instance
  */
-OBJ_CLASS_INSTANCE(ompi_op_t, ompi_object_t, 
+OBJ_CLASS_INSTANCE(ompi_op_t, opal_object_t, 
                    ompi_op_construct, ompi_op_destruct);
 
 

ompi/op/op.h

@@ -26,7 +26,7 @@
 
 #include "mpi.h"
 #include "datatype/datatype.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_pointer_array.h"
 #include "mpi/f77/fint_2_int.h"
 
@@ -195,7 +195,7 @@ typedef void (ompi_op_fortran_handler_fn_t)(void *, void *,
  * Back-end type of MPI_Op
  */
 struct ompi_op_t {
-  ompi_object_t super;
+  opal_object_t super;
   /**< Parent class, for reference counting */
 
   char o_name[MPI_MAX_OBJECT_NAME];

ompi/proc/proc.h

@@ -27,13 +27,13 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-OMPI_DECLSPEC extern ompi_class_t ompi_proc_t_class;
+OMPI_DECLSPEC extern opal_class_t ompi_proc_t_class;
 
 struct ompi_proc_t {
     ompi_list_item_t          super;       /* allow proc to be placed on a list */
     orte_process_name_t       proc_name;
     struct mca_pml_proc_t*    proc_pml;    /* PML specific proc data */
-    ompi_object_t*            proc_modex;  /* MCA module exchange data */
+    opal_object_t*            proc_modex;  /* MCA module exchange data */
     uint32_t                  proc_arch;
     struct ompi_convertor_t*  proc_convertor;
     ompi_mutex_t              proc_lock;

ompi/request/request.c

@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "request/request.h"
 #include "include/constants.h"
 

ompi/tools/ompi_info/ompi_info.cc

@@ -34,7 +34,7 @@
 #endif
 #include <errno.h>
 
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "runtime/runtime.h"
 #include "util/output.h"
 #include "util/cmd_line.h"
@@ -234,6 +234,6 @@ int main(int argc, char *argv[])
   ompi_info::close_components();
   OBJ_RELEASE(cmd_line);
   mca_base_close();
-  ompi_class_finalize();
+  opal_class_finalize();
   return 0;
 }

ompi/win/win.h

@@ -20,7 +20,7 @@
 
 #include "mpi.h"
 #include "errhandler/errhandler.h"
-#include "class/ompi_object.h"
+#include "opal/class/opal_object.h"
 #include "class/ompi_hash_table.h"
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
@@ -31,7 +31,7 @@ extern "C" {
 struct ompi_win_t {
   char w_name[MPI_MAX_OBJECT_NAME];
 
-  ompi_object_t w_base;
+  opal_object_t w_base;
 
   /* Attributes */
 

opal/class/Makefile.am

@@ -25,7 +25,7 @@ headers = \
         opal_free_list.h \
         ompi_hash_table.h \
         ompi_list.h \
-        ompi_object.h \
+        opal_object.h \
         ompi_value_array.h
 
 libclass_la_SOURCES = \
@@ -33,7 +33,7 @@ libclass_la_SOURCES = \
         opal_free_list.c \
         ompi_hash_table.c \
         ompi_list.c \
-        ompi_object.c \
+        opal_object.c \
         ompi_value_array.c
 
 # Conditionally install the header files