From 499e4de1e7fd3cd385fd126a1038858e1ef74175 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Sun, 3 Jul 2005 16:06:07 +0000 Subject: [PATCH] * rename ompi_object and ompi_class to opal_object and opal_class This commit was SVN r6321. --- ompi/attribute/attribute.c | 8 +- ompi/attribute/attribute.h | 4 +- ompi/class/ompi_bitmap.c | 2 +- ompi/class/ompi_bitmap.h | 4 +- ompi/class/ompi_free_list.c | 8 +- ompi/class/ompi_free_list.h | 8 +- ompi/class/ompi_pointer_array.c | 2 +- ompi/class/ompi_pointer_array.h | 4 +- ompi/class/ompi_rb_tree.c | 6 +- ompi/class/ompi_rb_tree.h | 8 +- ompi/communicator/comm_init.c | 2 +- ompi/communicator/communicator.h | 6 +- ompi/datatype/convertor.c | 2 +- ompi/datatype/convertor.h | 2 +- ompi/datatype/datatype.h | 4 +- ompi/datatype/dt_create.c | 2 +- ompi/errhandler/errclass.c | 2 +- ompi/errhandler/errclass.h | 4 +- ompi/errhandler/errcode-internal.c | 2 +- ompi/errhandler/errcode-internal.h | 4 +- ompi/errhandler/errcode.c | 2 +- ompi/errhandler/errcode.h | 4 +- ompi/errhandler/errhandler.c | 2 +- ompi/errhandler/errhandler.h | 4 +- ompi/file/file.c | 2 +- ompi/file/file.h | 2 +- ompi/group/group.h | 2 +- ompi/group/group_init.c | 2 +- ompi/mca/allocator/basic/allocator_basic.h | 2 +- .../allocator/bucket/allocator_bucket_alloc.h | 2 +- ompi/mca/btl/gm/btl_gm_proc.h | 2 +- ompi/mca/btl/mvapi/btl_mvapi_proc.h | 2 +- ompi/mca/btl/openib/btl_openib_proc.h | 2 +- ompi/mca/btl/sm/btl_sm.h | 2 +- ompi/mca/btl/sm/btl_sm_component.c | 2 +- ompi/mca/btl/template/btl_template_proc.h | 2 +- ompi/mca/coll/base/coll_base_comm_select.c | 2 +- ompi/mca/common/sm/common_sm_mmap.c | 2 +- ompi/mca/common/sm/common_sm_mmap.h | 2 +- ompi/mca/io/base/io_base_file_select.c | 2 +- ompi/mca/io/base/io_base_request.c | 4 +- ompi/mca/io/base/io_base_request.h | 2 +- ompi/mca/pml/base/pml_base_module_exchange.c | 4 +- ompi/mca/pml/base/pml_base_recvreq.c | 6 +- ompi/mca/pml/base/pml_base_request.c | 6 +- ompi/mca/pml/base/pml_base_request.h | 2 +- ompi/mca/pml/base/pml_base_sendreq.c | 6 +- ompi/mca/pml/base/pml_base_sendreq.h | 2 +- ompi/mca/pml/ob1/pml_ob1_comm.c | 4 +- ompi/mca/pml/ob1/pml_ob1_comm.h | 4 +- ompi/mca/pml/ob1/pml_ob1_endpoint.c | 2 +- ompi/mca/pml/ob1/pml_ob1_endpoint.h | 2 +- ompi/mca/pml/ob1/pml_ob1_proc.c | 2 +- ompi/mca/pml/ob1/pml_ob1_proc.h | 2 +- ompi/mca/pml/teg/pml_ptl_array.c | 2 +- ompi/mca/pml/teg/pml_ptl_array.h | 4 +- ompi/mca/pml/teg/pml_teg_proc.h | 2 +- ompi/mca/pml/teg/pml_teg_recvfrag.c | 2 +- ompi/mca/pml/uniq/pml_uniq_proc.h | 2 +- ompi/mca/pml/uniq/pml_uniq_recvfrag.c | 2 +- ompi/mca/ptl/base/ptl_base_comm.c | 8 +- ompi/mca/ptl/base/ptl_base_comm.h | 4 +- ompi/mca/ptl/base/ptl_base_fragment.c | 6 +- ompi/mca/ptl/base/ptl_base_recvfrag.h | 2 +- ompi/mca/ptl/base/ptl_base_sendfrag.c | 6 +- ompi/mca/ptl/base/ptl_base_sendfrag.h | 2 +- ompi/mca/ptl/elan/src/ptl_elan_frag.c | 12 +- ompi/mca/ptl/elan/src/ptl_elan_frag.h | 4 +- ompi/mca/ptl/elan/src/ptl_elan_peer.c | 6 +- ompi/mca/ptl/elan/src/ptl_elan_proc.c | 6 +- ompi/mca/ptl/elan/src/ptl_elan_proc.h | 4 +- ompi/mca/ptl/gm/ptl_gm_proc.c | 6 +- ompi/mca/ptl/gm/ptl_gm_proc.h | 4 +- ompi/mca/ptl/mx/ptl_mx_module.c | 2 +- ompi/mca/ptl/mx/ptl_mx_proc.h | 2 +- ompi/mca/ptl/prof/ptl_prof.c | 2 +- ompi/mca/ptl/sm/src/ptl_sm.h | 2 +- ompi/mca/ptl/sm/src/ptl_sm_component.c | 2 +- ompi/mca/ptl/tcp/ptl_tcp_peer.c | 6 +- ompi/mca/ptl/tcp/ptl_tcp_peer.h | 2 +- ompi/mca/ptl/tcp/ptl_tcp_proc.h | 2 +- ompi/mca/ptl/tcp/ptl_tcp_recvfrag.c | 6 +- ompi/mca/ptl/tcp/ptl_tcp_recvfrag.h | 2 +- ompi/mca/ptl/tcp/ptl_tcp_sendfrag.c | 6 +- ompi/mca/ptl/tcp/ptl_tcp_sendfrag.h | 2 +- ompi/mca/ptl/tcp/ptl_tcp_sendreq.c | 6 +- ompi/mca/ptl/tcp/ptl_tcp_sendreq.h | 2 +- ompi/mpi/c/pack.c | 2 +- ompi/mpi/c/pack_external.c | 2 +- ompi/mpi/c/pack_external_size.c | 2 +- ompi/mpi/c/pack_size.c | 2 +- ompi/mpi/c/unpack.c | 2 +- ompi/mpi/c/unpack_external.c | 2 +- ompi/op/op.c | 2 +- ompi/op/op.h | 4 +- ompi/proc/proc.h | 4 +- ompi/request/request.c | 2 +- ompi/tools/ompi_info/ompi_info.cc | 4 +- ompi/win/win.h | 4 +- opal/class/Makefile.am | 4 +- opal/class/ompi_hash_table.c | 2 +- opal/class/ompi_hash_table.h | 4 +- opal/class/ompi_list.c | 10 +- opal/class/ompi_list.h | 6 +- opal/class/ompi_value_array.c | 8 +- opal/class/ompi_value_array.h | 6 +- opal/class/opal_free_list.c | 8 +- opal/class/opal_free_list.h | 8 +- opal/class/{ompi_object.c => opal_object.c} | 22 ++-- opal/class/{ompi_object.h => opal_object.h} | 104 +++++++++--------- opal/event/event.c | 4 +- opal/include/sys/numa.h | 2 +- opal/mca/base/base.h | 2 +- opal/mca/base/mca_base_component_repository.c | 16 +-- opal/mca/base/mca_base_list.c | 8 +- opal/mca/base/mca_base_msgbuf_internal.h | 2 +- opal/mca/base/mca_base_param.c | 2 +- opal/mca/base/mca_base_param_internal.h | 4 +- opal/runtime/opal_finalize.c | 4 +- opal/threads/condition.c | 2 +- opal/threads/condition.h | 2 +- opal/threads/condition_pthread.c | 2 +- opal/threads/condition_pthread.h | 2 +- opal/threads/condition_spinlock.c | 2 +- opal/threads/condition_spinlock.h | 2 +- opal/threads/mutex.c | 2 +- opal/threads/mutex_unix.h | 4 +- opal/threads/mutex_windows.h | 4 +- opal/threads/thread.c | 2 +- opal/threads/thread.h | 6 +- opal/util/cmd_line.c | 4 +- opal/util/cmd_line.h | 4 +- orte/class/orte_bitmap.c | 2 +- orte/class/orte_bitmap.h | 4 +- orte/class/orte_pointer_array.c | 2 +- orte/class/orte_pointer_array.h | 4 +- orte/class/orte_value_array.c | 8 +- orte/class/orte_value_array.h | 6 +- orte/dps/dps_types.h | 4 +- orte/dps/orte_dps_open_close.c | 2 +- orte/include/orte_types.h | 2 +- orte/mca/gpr/base/gpr_base_open.c | 24 ++-- orte/mca/gpr/gpr_types.h | 14 +-- orte/mca/gpr/proxy/gpr_proxy.h | 4 +- orte/mca/gpr/proxy/gpr_proxy_component.c | 4 +- .../functional_layer/gpr_replica_segment_fn.c | 2 +- orte/mca/gpr/replica/gpr_replica.h | 22 ++-- .../gpr/replica/gpr_replica_class_instances.h | 48 ++++---- orte/mca/gpr/replica/gpr_replica_component.c | 2 +- orte/mca/ns/base/ns_base_open.c | 2 +- orte/mca/ns/proxy/src/ns_proxy_component.c | 6 +- .../mca/ns/replica/src/ns_replica_component.c | 8 +- orte/mca/oob/tcp/oob_tcp_addr.c | 2 +- orte/mca/oob/tcp/oob_tcp_addr.h | 4 +- orte/mca/pls/bproc_seed/pls_bproc_seed.c | 2 +- orte/mca/pls/fork/pls_fork_module.c | 2 +- orte/mca/pls/rsh/pls_rsh_module.c | 6 +- orte/mca/rmaps/base/rmaps_base_map.c | 4 +- orte/mca/rmgr/base/rmgr_base_open.c | 6 +- orte/mca/rmgr/rmgr_types.h | 4 +- orte/mca/schema/base/schema_base_fns.c | 4 +- orte/runtime/orte_wait.c | 10 +- orte/runtime/runtime_internal.h | 2 +- test/Unit-Test-Status.xls | Bin 26624 -> 26624 bytes test/class/ompi_hash_table.c | 2 +- test/mca/gpr/gpr_threads.c | 4 +- test/threads/ompi_condition.c | 4 +- test/threads/ompi_thread.c | 4 +- vcproj/ompi/ompi.vcproj | 4 +- 169 files changed, 417 insertions(+), 417 deletions(-) rename opal/class/{ompi_object.c => opal_object.c} (88%) rename opal/class/{ompi_object.h => opal_object.h} (81%) diff --git a/ompi/attribute/attribute.c b/ompi/attribute/attribute.c index cd66903722..8d0c022659 100644 --- a/ompi/attribute/attribute.c +++ b/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)); } diff --git a/ompi/attribute/attribute.h b/ompi/attribute/attribute.h index 92a5dc967e..99ed681c91 100644 --- a/ompi/attribute/attribute.h +++ b/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 diff --git a/ompi/class/ompi_bitmap.c b/ompi/class/ompi_bitmap.c index 45f221c555..f7ee3b83a1 100644 --- a/ompi/class/ompi_bitmap.c +++ b/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); diff --git a/ompi/class/ompi_bitmap.h b/ompi/class/ompi_bitmap.h index 9f3e456979..aaaf4242f9 100644 --- a/ompi/class/ompi_bitmap.h +++ b/ompi/class/ompi_bitmap.h @@ -114,13 +114,13 @@ #include #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 diff --git a/ompi/class/ompi_free_list.c b/ompi/class/ompi_free_list.c index ff3b9aaf1f..56c0f4f87c 100644 --- a/ompi/class/ompi_free_list.c +++ b/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, - (ompi_destruct_t)ompi_free_list_destruct + (opal_construct_t)ompi_free_list_construct, + (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, diff --git a/ompi/class/ompi_free_list.h b/ompi/class/ompi_free_list.h index 7045e8d59f..fc0343e712 100644 --- a/ompi/class/ompi_free_list.h +++ b/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, diff --git a/ompi/class/ompi_pointer_array.c b/ompi/class/ompi_pointer_array.c index d18470ec7f..051314bb52 100644 --- a/ompi/class/ompi_pointer_array.c +++ b/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); diff --git a/ompi/class/ompi_pointer_array.h b/ompi/class/ompi_pointer_array.h index 38e5b41d8f..1991ef99ed 100644 --- a/ompi/class/ompi_pointer_array.h +++ b/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 diff --git a/ompi/class/ompi_rb_tree.c b/ompi/class/ompi_rb_tree.c index 966b517af8..28a53179ed 100644 --- a/ompi/class/ompi_rb_tree.c +++ b/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); diff --git a/ompi/class/ompi_rb_tree.h b/ompi/class/ompi_rb_tree.h index 5437ff44fb..e3d72764c4 100644 --- a/ompi/class/ompi_rb_tree.h +++ b/ompi/class/ompi_rb_tree.h @@ -25,7 +25,7 @@ #include #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 diff --git a/ompi/communicator/comm_init.c b/ompi/communicator/comm_init.c index 45af1b3ba3..36520a771c 100644 --- a/ompi/communicator/comm_init.c +++ b/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 diff --git a/ompi/communicator/communicator.h b/ompi/communicator/communicator.h index 9628e50d11..a247fb322e 100644 --- a/ompi/communicator/communicator.h +++ b/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]; diff --git a/ompi/datatype/convertor.c b/ompi/datatype/convertor.c index b2f652cfad..b5ff8e46ea 100644 --- a/ompi/datatype/convertor.c +++ b/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 ); /* diff --git a/ompi/datatype/convertor.h b/ompi/datatype/convertor.h index 851caaa9d5..1648a1374b 100644 --- a/ompi/datatype/convertor.h +++ b/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 */ diff --git a/ompi/datatype/datatype.h b/ompi/datatype/datatype.h index f3596ff001..7ada5745cd 100644 --- a/ompi/datatype/datatype.h +++ b/ompi/datatype/datatype.h @@ -35,7 +35,7 @@ #endif #include #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 */ diff --git a/ompi/datatype/dt_create.c b/ompi/datatype/dt_create.c index c2dc78e674..ceb9756038 100644 --- a/ompi/datatype/dt_create.c +++ b/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 ) { diff --git a/ompi/errhandler/errclass.c b/ompi/errhandler/errclass.c index d074055b54..43c3f28d75 100644 --- a/ompi/errhandler/errclass.c +++ b/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) { diff --git a/ompi/errhandler/errclass.h b/ompi/errhandler/errclass.h index 0fee6d6aae..b963ce1103 100644 --- a/ompi/errhandler/errclass.h +++ b/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; diff --git a/ompi/errhandler/errcode-internal.c b/ompi/errhandler/errcode-internal.c index d43fb76e5f..6e547ad15f 100644 --- a/ompi/errhandler/errcode-internal.c +++ b/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) { diff --git a/ompi/errhandler/errcode-internal.h b/ompi/errhandler/errcode-internal.h index 7d3e84acb6..20fe6168f9 100644 --- a/ompi/errhandler/errcode-internal.h +++ b/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; diff --git a/ompi/errhandler/errcode.c b/ompi/errhandler/errcode.c index a1c152b25f..09c5464428 100644 --- a/ompi/errhandler/errcode.c +++ b/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) { diff --git a/ompi/errhandler/errcode.h b/ompi/errhandler/errcode.h index 3218f2b4a6..7920ae243b 100644 --- a/ompi/errhandler/errcode.h +++ b/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]; diff --git a/ompi/errhandler/errhandler.c b/ompi/errhandler/errhandler.c index 78e4e05ba5..ea304402b4 100644 --- a/ompi/errhandler/errhandler.c +++ b/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); diff --git a/ompi/errhandler/errhandler.h b/ompi/errhandler/errhandler.h index fe581eb033..74ff662af4 100644 --- a/ompi/errhandler/errhandler.h +++ b/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 */ diff --git a/ompi/file/file.c b/ompi/file/file.c index dbd3cbd363..782daeb3e7 100644 --- a/ompi/file/file.c +++ b/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); diff --git a/ompi/file/file.h b/ompi/file/file.h index fcb47ced36..6a59555ec8 100644 --- a/ompi/file/file.h +++ b/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; diff --git a/ompi/group/group.h b/ompi/group/group.h index de14e7d269..e9da2489fa 100644 --- a/ompi/group/group.h +++ b/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 */ diff --git a/ompi/group/group_init.c b/ompi/group/group_init.c index fed49c8a57..b8782f8e68 100644 --- a/ompi/group/group_init.c +++ b/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); diff --git a/ompi/mca/allocator/basic/allocator_basic.h b/ompi/mca/allocator/basic/allocator_basic.h index 034a0bafef..53c3878be0 100644 --- a/ompi/mca/allocator/basic/allocator_basic.h +++ b/ompi/mca/allocator/basic/allocator_basic.h @@ -24,7 +24,7 @@ #include #include #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" diff --git a/ompi/mca/allocator/bucket/allocator_bucket_alloc.h b/ompi/mca/allocator/bucket/allocator_bucket_alloc.h index eff579fa60..c543a744c6 100644 --- a/ompi/mca/allocator/bucket/allocator_bucket_alloc.h +++ b/ompi/mca/allocator/bucket/allocator_bucket_alloc.h @@ -24,7 +24,7 @@ #include #include #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" { diff --git a/ompi/mca/btl/gm/btl_gm_proc.h b/ompi/mca/btl/gm/btl_gm_proc.h index e91f74cf19..387b99fee1 100644 --- a/ompi/mca/btl/gm/btl_gm_proc.h +++ b/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" diff --git a/ompi/mca/btl/mvapi/btl_mvapi_proc.h b/ompi/mca/btl/mvapi/btl_mvapi_proc.h index 3b4ade91e8..96c13bbfe1 100644 --- a/ompi/mca/btl/mvapi/btl_mvapi_proc.h +++ b/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" diff --git a/ompi/mca/btl/openib/btl_openib_proc.h b/ompi/mca/btl/openib/btl_openib_proc.h index 308adcae4e..25388d0cef 100644 --- a/ompi/mca/btl/openib/btl_openib_proc.h +++ b/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" diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h index 9cd3bd2713..c50907ef71 100644 --- a/ompi/mca/btl/sm/btl_sm.h +++ b/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 diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c index 7e765c08bf..ff2896bad4 100644 --- a/ompi/mca/btl/sm/btl_sm_component.c +++ b/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; diff --git a/ompi/mca/btl/template/btl_template_proc.h b/ompi/mca/btl/template/btl_template_proc.h index c8316fe00b..6d267452bc 100644 --- a/ompi/mca/btl/template/btl_template_proc.h +++ b/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" diff --git a/ompi/mca/coll/base/coll_base_comm_select.c b/ompi/mca/coll/base/coll_base_comm_select.c index de4942e974..26937469bf 100644 --- a/ompi/mca/coll/base/coll_base_comm_select.c +++ b/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" diff --git a/ompi/mca/common/sm/common_sm_mmap.c b/ompi/mca/common/sm/common_sm_mmap.c index f9d48e50d3..3323658722 100644 --- a/ompi/mca/common/sm/common_sm_mmap.c +++ b/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 ); diff --git a/ompi/mca/common/sm/common_sm_mmap.h b/ompi/mca/common/sm/common_sm_mmap.h index c56c6d08ae..c5511078a4 100644 --- a/ompi/mca/common/sm/common_sm_mmap.h +++ b/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" diff --git a/ompi/mca/io/base/io_base_file_select.c b/ompi/mca/io/base/io_base_file_select.c index 7b2fde98ab..4fdb245e1b 100644 --- a/ompi/mca/io/base/io_base_file_select.c +++ b/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" diff --git a/ompi/mca/io/base/io_base_request.c b/ompi/mca/io/base/io_base_request.c index 9e1a0563d4..32c1b31f56 100644 --- a/ompi/mca/io/base/io_base_request.c +++ b/ompi/mca/io/base/io_base_request.c @@ -20,7 +20,7 @@ #include #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; diff --git a/ompi/mca/io/base/io_base_request.h b/ompi/mca/io/base/io_base_request.h index b9705f83ea..168a82dbb9 100644 --- a/ompi/mca/io/base/io_base_request.h +++ b/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" diff --git a/ompi/mca/pml/base/pml_base_module_exchange.c b/ompi/mca/pml/base/pml_base_module_exchange.c index 960d89543e..718e664404 100644 --- a/ompi/mca/pml/base/pml_base_module_exchange.c +++ b/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 ); diff --git a/ompi/mca/pml/base/pml_base_recvreq.c b/ompi/mca/pml/base/pml_base_recvreq.c index 6945d6711e..78071ff225 100644 --- a/ompi/mca/pml/base/pml_base_recvreq.c +++ b/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, - (ompi_destruct_t) mca_pml_base_recv_request_destruct + (opal_construct_t) mca_pml_base_recv_request_construct, + (opal_destruct_t) mca_pml_base_recv_request_destruct }; diff --git a/ompi/mca/pml/base/pml_base_request.c b/ompi/mca/pml/base/pml_base_request.c index 8f0f44e408..8617f7db10 100644 --- a/ompi/mca/pml/base/pml_base_request.c +++ b/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, - (ompi_destruct_t) mca_pml_base_request_destruct + (opal_construct_t) mca_pml_base_request_construct, + (opal_destruct_t) mca_pml_base_request_destruct }; diff --git a/ompi/mca/pml/base/pml_base_request.h b/ompi/mca/pml/base/pml_base_request.h index 9aa0a2ab7b..fae5f63352 100644 --- a/ompi/mca/pml/base/pml_base_request.h +++ b/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. diff --git a/ompi/mca/pml/base/pml_base_sendreq.c b/ompi/mca/pml/base/pml_base_sendreq.c index 46363b0dcf..d6c978acdc 100644 --- a/ompi/mca/pml/base/pml_base_sendreq.c +++ b/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, - (ompi_destruct_t) mca_pml_base_send_request_destruct + (opal_construct_t) mca_pml_base_send_request_construct, + (opal_destruct_t) mca_pml_base_send_request_destruct }; diff --git a/ompi/mca/pml/base/pml_base_sendreq.h b/ompi/mca/pml/base/pml_base_sendreq.h index e1ba9ef9b0..7460881691 100644 --- a/ompi/mca/pml/base/pml_base_sendreq.h +++ b/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; /** diff --git a/ompi/mca/pml/ob1/pml_ob1_comm.c b/ompi/mca/pml/ob1/pml_ob1_comm.c index 76e3757aca..2ff0889462 100644 --- a/ompi/mca/pml/ob1/pml_ob1_comm.c +++ b/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); diff --git a/ompi/mca/pml/ob1/pml_ob1_comm.h b/ompi/mca/pml/ob1/pml_ob1_comm.h index 8cc79dde1b..87ef0bb6c3 100644 --- a/ompi/mca/pml/ob1/pml_ob1_comm.h +++ b/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 */ diff --git a/ompi/mca/pml/ob1/pml_ob1_endpoint.c b/ompi/mca/pml/ob1/pml_ob1_endpoint.c index cc521d029c..342ef01da6 100644 --- a/ompi/mca/pml/ob1/pml_ob1_endpoint.c +++ b/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 ); diff --git a/ompi/mca/pml/ob1/pml_ob1_endpoint.h b/ompi/mca/pml/ob1/pml_ob1_endpoint.h index 9dfdf4fa4b..4959799aaa 100644 --- a/ompi/mca/pml/ob1/pml_ob1_endpoint.h +++ b/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*/ diff --git a/ompi/mca/pml/ob1/pml_ob1_proc.c b/ompi/mca/pml/ob1/pml_ob1_proc.c index 5c156227e2..88a5ba20df 100644 --- a/ompi/mca/pml/ob1/pml_ob1_proc.c +++ b/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 ); diff --git a/ompi/mca/pml/ob1/pml_ob1_proc.h b/ompi/mca/pml/ob1/pml_ob1_proc.h index 0b33d950e4..d2a6922a6a 100644 --- a/ompi/mca/pml/ob1/pml_ob1_proc.h +++ b/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 */ diff --git a/ompi/mca/pml/teg/pml_ptl_array.c b/ompi/mca/pml/teg/pml_ptl_array.c index 8742937d8a..37e226ad36 100644 --- a/ompi/mca/pml/teg/pml_ptl_array.c +++ b/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 ); diff --git a/ompi/mca/pml/teg/pml_ptl_array.h b/ompi/mca/pml/teg/pml_ptl_array.h index 7171d92607..34f1117536 100644 --- a/ompi/mca/pml/teg/pml_ptl_array.h +++ b/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 */ diff --git a/ompi/mca/pml/teg/pml_teg_proc.h b/ompi/mca/pml/teg/pml_teg_proc.h index 7f06be4245..825c50dee9 100644 --- a/ompi/mca/pml/teg/pml_teg_proc.h +++ b/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; /** diff --git a/ompi/mca/pml/teg/pml_teg_recvfrag.c b/ompi/mca/pml/teg/pml_teg_recvfrag.c index 885dcb24b2..bddd01f2b3 100644 --- a/ompi/mca/pml/teg/pml_teg_recvfrag.c +++ b/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; /** diff --git a/ompi/mca/pml/uniq/pml_uniq_proc.h b/ompi/mca/pml/uniq/pml_uniq_proc.h index f917dcf43c..a5d0c3bbb2 100644 --- a/ompi/mca/pml/uniq/pml_uniq_proc.h +++ b/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; /** diff --git a/ompi/mca/pml/uniq/pml_uniq_recvfrag.c b/ompi/mca/pml/uniq/pml_uniq_recvfrag.c index 4fdddb38dc..5d35d5b870 100644 --- a/ompi/mca/pml/uniq/pml_uniq_recvfrag.c +++ b/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; /** diff --git a/ompi/mca/ptl/base/ptl_base_comm.c b/ompi/mca/ptl/base/ptl_base_comm.c index 7ed467514e..c36bf23c08 100644 --- a/ompi/mca/ptl/base/ptl_base_comm.c +++ b/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), - (ompi_construct_t)mca_pml_ptl_comm_construct, - (ompi_destruct_t)mca_pml_ptl_comm_destruct + OBJ_CLASS(opal_object_t), + (opal_construct_t)mca_pml_ptl_comm_construct, + (opal_destruct_t)mca_pml_ptl_comm_destruct }; diff --git a/ompi/mca/ptl/base/ptl_base_comm.h b/ompi/mca/ptl/base/ptl_base_comm.h index 739438e914..60adc31cc5 100644 --- a/ompi/mca/ptl/base/ptl_base_comm.h +++ b/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 */ diff --git a/ompi/mca/ptl/base/ptl_base_fragment.c b/ompi/mca/ptl/base/ptl_base_fragment.c index 33377ea443..a3fb95b2bc 100644 --- a/ompi/mca/ptl/base/ptl_base_fragment.c +++ b/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, - (ompi_destruct_t) mca_ptl_base_frag_destruct + (opal_construct_t) mca_ptl_base_frag_construct, + (opal_destruct_t) mca_ptl_base_frag_destruct }; static void mca_ptl_base_frag_construct(mca_ptl_base_frag_t* frag) diff --git a/ompi/mca/ptl/base/ptl_base_recvfrag.h b/ompi/mca/ptl/base/ptl_base_recvfrag.h index 9fac6a41a2..fe52c28cfe 100644 --- a/ompi/mca/ptl/base/ptl_base_recvfrag.h +++ b/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. diff --git a/ompi/mca/ptl/base/ptl_base_sendfrag.c b/ompi/mca/ptl/base/ptl_base_sendfrag.c index dac35a56c5..7d1118489a 100644 --- a/ompi/mca/ptl/base/ptl_base_sendfrag.c +++ b/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, - (ompi_destruct_t) mca_ptl_base_send_frag_destruct + (opal_construct_t) mca_ptl_base_send_frag_construct, + (opal_destruct_t) mca_ptl_base_send_frag_destruct }; diff --git a/ompi/mca/ptl/base/ptl_base_sendfrag.h b/ompi/mca/ptl/base/ptl_base_sendfrag.h index deede45042..a70cee857a 100644 --- a/ompi/mca/ptl/base/ptl_base_sendfrag.h +++ b/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 diff --git a/ompi/mca/ptl/elan/src/ptl_elan_frag.c b/ompi/mca/ptl/elan/src/ptl_elan_frag.c index 091fae7028..02f5768cc8 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan_frag.c +++ b/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, - (ompi_destruct_t) mca_ptl_elan_send_frag_destruct + (opal_construct_t) mca_ptl_elan_send_frag_construct, + (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, - (ompi_destruct_t) mca_ptl_elan_recv_frag_destruct + (opal_construct_t) mca_ptl_elan_recv_frag_construct, + (opal_destruct_t) mca_ptl_elan_recv_frag_destruct }; diff --git a/ompi/mca/ptl/elan/src/ptl_elan_frag.h b/ompi/mca/ptl/elan/src/ptl_elan_frag.h index d55c367607..ffe73b7f77 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan_frag.h +++ b/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 ompi_class_t mca_ptl_elan_recv_frag_t_class; +extern opal_class_t mca_ptl_elan_send_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, diff --git a/ompi/mca/ptl/elan/src/ptl_elan_peer.c b/ompi/mca/ptl/elan/src/ptl_elan_peer.c index 18d7a61b5b..8eddc30ea1 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan_peer.c +++ b/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, - (ompi_destruct_t) mca_ptl_elan_peer_destruct + (opal_construct_t) mca_ptl_elan_peer_construct, + (opal_destruct_t) mca_ptl_elan_peer_destruct }; diff --git a/ompi/mca/ptl/elan/src/ptl_elan_proc.c b/ompi/mca/ptl/elan/src/ptl_elan_proc.c index 1315c367c5..afaaac91f0 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan_proc.c +++ b/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, - (ompi_destruct_t) mca_ptl_elan_proc_destruct + (opal_construct_t) mca_ptl_elan_proc_construct, + (opal_destruct_t) mca_ptl_elan_proc_destruct }; diff --git a/ompi/mca/ptl/elan/src/ptl_elan_proc.h b/ompi/mca/ptl/elan/src/ptl_elan_proc.h index 16be42a6ec..0bd3722bd1 100644 --- a/ompi/mca/ptl/elan/src/ptl_elan_proc.h +++ b/ompi/mca/ptl/elan/src/ptl_elan_proc.h @@ -22,14 +22,14 @@ #include #include #include -#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 diff --git a/ompi/mca/ptl/gm/ptl_gm_proc.c b/ompi/mca/ptl/gm/ptl_gm_proc.c index 637cdbf99c..daf10d10b1 100644 --- a/ompi/mca/ptl/gm/ptl_gm_proc.c +++ b/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, - (ompi_destruct_t) mca_ptl_gm_proc_destruct + (opal_construct_t) mca_ptl_gm_proc_construct, + (opal_destruct_t) mca_ptl_gm_proc_destruct }; diff --git a/ompi/mca/ptl/gm/ptl_gm_proc.h b/ompi/mca/ptl/gm/ptl_gm_proc.h index e08fc6f310..eb49cfbf9c 100644 --- a/ompi/mca/ptl/gm/ptl_gm_proc.h +++ b/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 */ diff --git a/ompi/mca/ptl/mx/ptl_mx_module.c b/ompi/mca/ptl/mx/ptl_mx_module.c index 69bb67999b..fdf3965197 100644 --- a/ompi/mca/ptl/mx/ptl_mx_module.c +++ b/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; diff --git a/ompi/mca/ptl/mx/ptl_mx_proc.h b/ompi/mca/ptl/mx/ptl_mx_proc.h index 85c540a6bf..995ac9021c 100644 --- a/ompi/mca/ptl/mx/ptl_mx_proc.h +++ b/ompi/mca/ptl/mx/ptl_mx_proc.h @@ -22,7 +22,7 @@ #include "ompi_config.h" #include #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" diff --git a/ompi/mca/ptl/prof/ptl_prof.c b/ompi/mca/ptl/prof/ptl_prof.c index e83b917c43..69ab90ca81 100644 --- a/ompi/mca/ptl/prof/ptl_prof.c +++ b/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 ); diff --git a/ompi/mca/ptl/sm/src/ptl_sm.h b/ompi/mca/ptl/sm/src/ptl_sm.h index 1e03fcdd29..46f28f1f02 100644 --- a/ompi/mca/ptl/sm/src/ptl_sm.h +++ b/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 diff --git a/ompi/mca/ptl/sm/src/ptl_sm_component.c b/ompi/mca/ptl/sm/src/ptl_sm_component.c index e486466744..157b4e5f98 100644 --- a/ompi/mca/ptl/sm/src/ptl_sm_component.c +++ b/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; diff --git a/ompi/mca/ptl/tcp/ptl_tcp_peer.c b/ompi/mca/ptl/tcp/ptl_tcp_peer.c index 9ae9afe32d..46d9a3b011 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_peer.c +++ b/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, - (ompi_destruct_t)mca_ptl_tcp_peer_destruct + (opal_construct_t)mca_ptl_tcp_peer_construct, + (opal_destruct_t)mca_ptl_tcp_peer_destruct }; /* diff --git a/ompi/mca/ptl/tcp/ptl_tcp_peer.h b/ompi/mca/ptl/tcp/ptl_tcp_peer.h index 67d6e550de..5ea5b6a5d7 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_peer.h +++ b/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); diff --git a/ompi/mca/ptl/tcp/ptl_tcp_proc.h b/ompi/mca/ptl/tcp/ptl_tcp_proc.h index aac1b62e79..3ea48a4a48 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_proc.h +++ b/ompi/mca/ptl/tcp/ptl_tcp_proc.h @@ -29,7 +29,7 @@ #include #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" diff --git a/ompi/mca/ptl/tcp/ptl_tcp_recvfrag.c b/ompi/mca/ptl/tcp/ptl_tcp_recvfrag.c index b9f0bf3019..27b5cc95bc 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_recvfrag.c +++ b/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, - (ompi_destruct_t)mca_ptl_tcp_recv_frag_destruct + (opal_construct_t)mca_ptl_tcp_recv_frag_construct, + (opal_destruct_t)mca_ptl_tcp_recv_frag_destruct }; diff --git a/ompi/mca/ptl/tcp/ptl_tcp_recvfrag.h b/ompi/mca/ptl/tcp/ptl_tcp_recvfrag.h index 9044d5e6b6..c2e00dfa9c 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_recvfrag.h +++ b/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. diff --git a/ompi/mca/ptl/tcp/ptl_tcp_sendfrag.c b/ompi/mca/ptl/tcp/ptl_tcp_sendfrag.c index 771cc27ff7..41706e8f38 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_sendfrag.c +++ b/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, - (ompi_destruct_t)mca_ptl_tcp_send_frag_destruct + (opal_construct_t)mca_ptl_tcp_send_frag_construct, + (opal_destruct_t)mca_ptl_tcp_send_frag_destruct }; /* diff --git a/ompi/mca/ptl/tcp/ptl_tcp_sendfrag.h b/ompi/mca/ptl/tcp/ptl_tcp_sendfrag.h index 7b280a6a13..7551089fe1 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_sendfrag.h +++ b/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; diff --git a/ompi/mca/ptl/tcp/ptl_tcp_sendreq.c b/ompi/mca/ptl/tcp/ptl_tcp_sendreq.c index 3508905000..67bb3677e0 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_sendreq.c +++ b/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, - (ompi_destruct_t)mca_ptl_tcp_send_request_destruct + (opal_construct_t)mca_ptl_tcp_send_request_construct, + (opal_destruct_t)mca_ptl_tcp_send_request_destruct }; diff --git a/ompi/mca/ptl/tcp/ptl_tcp_sendreq.h b/ompi/mca/ptl/tcp/ptl_tcp_sendreq.h index b6bea72c93..e08c61cda3 100644 --- a/ompi/mca/ptl/tcp/ptl_tcp_sendreq.h +++ b/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. diff --git a/ompi/mpi/c/pack.c b/ompi/mpi/c/pack.c index 8b492ad715..08fe6ff85a 100644 --- a/ompi/mpi/c/pack.c +++ b/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 diff --git a/ompi/mpi/c/pack_external.c b/ompi/mpi/c/pack_external.c index 5ee051b494..292115dfc1 100644 --- a/ompi/mpi/c/pack_external.c +++ b/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 diff --git a/ompi/mpi/c/pack_external_size.c b/ompi/mpi/c/pack_external_size.c index b1737754f7..9467b79dbb 100644 --- a/ompi/mpi/c/pack_external_size.c +++ b/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" diff --git a/ompi/mpi/c/pack_size.c b/ompi/mpi/c/pack_size.c index bc4404240c..20f699c06f 100644 --- a/ompi/mpi/c/pack_size.c +++ b/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" diff --git a/ompi/mpi/c/unpack.c b/ompi/mpi/c/unpack.c index bf4be705af..75c2580966 100644 --- a/ompi/mpi/c/unpack.c +++ b/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 diff --git a/ompi/mpi/c/unpack_external.c b/ompi/mpi/c/unpack_external.c index e7cfb73dff..a2433a053d 100644 --- a/ompi/mpi/c/unpack_external.c +++ b/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 diff --git a/ompi/op/op.c b/ompi/op/op.c index da7b1f8347..c7ba09ac67 100644 --- a/ompi/op/op.c +++ b/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); diff --git a/ompi/op/op.h b/ompi/op/op.h index e7c5ee9eb1..9f12acff0a 100644 --- a/ompi/op/op.h +++ b/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]; diff --git a/ompi/proc/proc.h b/ompi/proc/proc.h index 9fe3bc3719..bd39b99252 100644 --- a/ompi/proc/proc.h +++ b/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; diff --git a/ompi/request/request.c b/ompi/request/request.c index 7fc03a1fa6..0ffed5aa1b 100644 --- a/ompi/request/request.c +++ b/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" diff --git a/ompi/tools/ompi_info/ompi_info.cc b/ompi/tools/ompi_info/ompi_info.cc index 4822bc5a9c..2024aeea44 100644 --- a/ompi/tools/ompi_info/ompi_info.cc +++ b/ompi/tools/ompi_info/ompi_info.cc @@ -34,7 +34,7 @@ #endif #include -#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; } diff --git a/ompi/win/win.h b/ompi/win/win.h index 28c5c86614..08c8ca3bb9 100644 --- a/ompi/win/win.h +++ b/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 */ diff --git a/opal/class/Makefile.am b/opal/class/Makefile.am index c203862990..cbb394c2bf 100644 --- a/opal/class/Makefile.am +++ b/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 diff --git a/opal/class/ompi_hash_table.c b/opal/class/ompi_hash_table.c index 46b3ca6be5..a3a7ebd9b6 100644 --- a/opal/class/ompi_hash_table.c +++ b/opal/class/ompi_hash_table.c @@ -36,7 +36,7 @@ static void ompi_hash_table_destruct(ompi_hash_table_t* ht); OBJ_CLASS_INSTANCE( ompi_hash_table_t, - ompi_object_t, + opal_object_t, ompi_hash_table_construct, ompi_hash_table_destruct ); diff --git a/opal/class/ompi_hash_table.h b/opal/class/ompi_hash_table.h index fadd6ce4af..6f207e9875 100644 --- a/opal/class/ompi_hash_table.h +++ b/opal/class/ompi_hash_table.h @@ -34,12 +34,12 @@ extern "C" { #endif -OMPI_DECLSPEC extern ompi_class_t ompi_hash_table_t_class; +OMPI_DECLSPEC extern opal_class_t ompi_hash_table_t_class; struct ompi_hash_table_t { - ompi_object_t super; /**< subclass of ompi_object_t */ + opal_object_t super; /**< subclass of opal_object_t */ ompi_list_t ht_nodes; /**< free list of hash nodes */ ompi_list_t *ht_table; /**< each item is an array of ompi_fhnode_t nodes */ size_t ht_table_size; /**< size of table */ diff --git a/opal/class/ompi_list.c b/opal/class/ompi_list.c index 60a91867a8..9a9daea1f5 100644 --- a/opal/class/ompi_list.c +++ b/opal/class/ompi_list.c @@ -26,11 +26,11 @@ static void ompi_list_item_construct(ompi_list_item_t*); static void ompi_list_item_destruct(ompi_list_item_t*); -ompi_class_t ompi_list_item_t_class = { +opal_class_t ompi_list_item_t_class = { "ompi_list_item_t", - OBJ_CLASS(ompi_object_t), - (ompi_construct_t) ompi_list_item_construct, - (ompi_destruct_t) ompi_list_item_destruct + OBJ_CLASS(opal_object_t), + (opal_construct_t) ompi_list_item_construct, + (opal_destruct_t) ompi_list_item_destruct }; static void ompi_list_construct(ompi_list_t*); @@ -38,7 +38,7 @@ static void ompi_list_destruct(ompi_list_t*); OBJ_CLASS_INSTANCE( ompi_list_t, - ompi_object_t, + opal_object_t, ompi_list_construct, ompi_list_destruct ); diff --git a/opal/class/ompi_list.h b/opal/class/ompi_list.h index 36126baef7..1ef94a1748 100644 --- a/opal/class/ompi_list.h +++ b/opal/class/ompi_list.h @@ -62,7 +62,7 @@ #include #include -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #if OMPI_ENABLE_DEBUG /* Need atomics for debugging (reference counting) */ @@ -94,7 +94,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(ompi_list_item_t); */ struct ompi_list_item_t { - ompi_object_t super; + opal_object_t super; /**< Generic parent class for all Open MPI objects */ volatile struct ompi_list_item_t *ompi_list_next; /**< Pointer to next list item */ @@ -142,7 +142,7 @@ typedef struct ompi_list_item_t ompi_list_item_t; */ struct ompi_list_t { - ompi_object_t super; + opal_object_t super; /**< Generic parent class for all Open MPI objects */ ompi_list_item_t ompi_list_head; /**< Head item of the list */ diff --git a/opal/class/ompi_value_array.c b/opal/class/ompi_value_array.c index a346f88bd3..ccc1fe5ef2 100644 --- a/opal/class/ompi_value_array.c +++ b/opal/class/ompi_value_array.c @@ -33,11 +33,11 @@ static void ompi_value_array_destruct(ompi_value_array_t* array) free(array->array_items); } -ompi_class_t ompi_value_array_t_class = { +opal_class_t ompi_value_array_t_class = { "ompi_value_array_t", - OBJ_CLASS(ompi_object_t), - (ompi_construct_t)ompi_value_array_construct, - (ompi_destruct_t)ompi_value_array_destruct + OBJ_CLASS(opal_object_t), + (opal_construct_t)ompi_value_array_construct, + (opal_destruct_t)ompi_value_array_destruct }; diff --git a/opal/class/ompi_value_array.h b/opal/class/ompi_value_array.h index 38e9ea7340..ac6d6f7e00 100644 --- a/opal/class/ompi_value_array.h +++ b/opal/class/ompi_value_array.h @@ -21,7 +21,7 @@ #include "ompi_config.h" #include "include/constants.h" #include "include/types.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #if OMPI_ENABLE_DEBUG #include "util/output.h" #endif @@ -36,12 +36,12 @@ extern "C" { #endif -OMPI_DECLSPEC extern ompi_class_t ompi_value_array_t_class; +OMPI_DECLSPEC extern opal_class_t ompi_value_array_t_class; struct ompi_value_array_t { - ompi_object_t super; + opal_object_t super; unsigned char* array_items; size_t array_item_sizeof; size_t array_size; diff --git a/opal/class/opal_free_list.c b/opal/class/opal_free_list.c index 2ca5656715..6715224d47 100644 --- a/opal/class/opal_free_list.c +++ b/opal/class/opal_free_list.c @@ -24,11 +24,11 @@ static void opal_free_list_construct(opal_free_list_t* fl); static void opal_free_list_destruct(opal_free_list_t* fl); -ompi_class_t opal_free_list_t_class = { +opal_class_t opal_free_list_t_class = { "opal_free_list_t", OBJ_CLASS(ompi_list_t), - (ompi_construct_t)opal_free_list_construct, - (ompi_destruct_t)opal_free_list_destruct + (opal_construct_t)opal_free_list_construct, + (opal_destruct_t)opal_free_list_destruct }; @@ -51,7 +51,7 @@ static void opal_free_list_destruct(opal_free_list_t* fl) int opal_free_list_init( opal_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) diff --git a/opal/class/opal_free_list.h b/opal/class/opal_free_list.h index f205b17bd0..d80c0d33c5 100644 --- a/opal/class/opal_free_list.h +++ b/opal/class/opal_free_list.h @@ -27,7 +27,7 @@ #if defined(c_plusplus) || defined(__cplusplus) extern "C" { #endif -OMPI_DECLSPEC extern ompi_class_t opal_free_list_t_class; +OMPI_DECLSPEC extern opal_class_t opal_free_list_t_class; struct opal_free_list_t @@ -38,7 +38,7 @@ struct opal_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; ompi_mutex_t fl_lock; ompi_condition_t fl_condition; }; @@ -56,7 +56,7 @@ typedef struct opal_free_list_item_t opal_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. @@ -65,7 +65,7 @@ typedef struct opal_free_list_item_t opal_free_list_item_t; OMPI_DECLSPEC int opal_free_list_init( opal_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); diff --git a/opal/class/ompi_object.c b/opal/class/opal_object.c similarity index 88% rename from opal/class/ompi_object.c rename to opal/class/opal_object.c index 465e9c88f6..8c77a1eed4 100644 --- a/opal/class/ompi_object.c +++ b/opal/class/opal_object.c @@ -17,7 +17,7 @@ /** * @file * - * Implementation of ompi_object_t, the base ompi foundation class + * Implementation of opal_object_t, the base ompi foundation class */ #include "ompi_config.h" @@ -26,15 +26,15 @@ #include "include/constants.h" #include "include/sys/atomic.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" /* * Instantiation of class descriptor for the base class. This is * special, since be mark it as already initialized, with no parent * and no constructor or desctructor */ -ompi_class_t ompi_object_t_class = { - "ompi_object_t", /* name */ +opal_class_t opal_object_t_class = { + "opal_object_t", /* name */ NULL, /* parent class */ NULL, /* constructor */ NULL, /* destructor */ @@ -57,16 +57,16 @@ static const int increment = 10; /* * Local functions */ -static void save_class(ompi_class_t *cls); +static void save_class(opal_class_t *cls); static void expand_array(void); /* * Lazy initialization of class descriptor. */ -void ompi_class_initialize(ompi_class_t *cls) +void opal_class_initialize(opal_class_t *cls) { - ompi_class_t *c; + opal_class_t *c; int i; assert(cls); @@ -102,8 +102,8 @@ void ompi_class_initialize(ompi_class_t *cls) */ cls->cls_construct_array = - (void (**)(ompi_object_t*))malloc(cls->cls_depth * - sizeof(ompi_construct_t) * 2); + (void (**)(opal_object_t*))malloc(cls->cls_depth * + sizeof(opal_construct_t) * 2); if (NULL == cls->cls_construct_array) { perror("Out of memory"); exit(-1); @@ -129,7 +129,7 @@ void ompi_class_initialize(ompi_class_t *cls) /* * Note that this is finalize for *all* classes. */ -int ompi_class_finalize(void) +int opal_class_finalize(void) { int i; @@ -149,7 +149,7 @@ int ompi_class_finalize(void) } -static void save_class(ompi_class_t *cls) +static void save_class(opal_class_t *cls) { if (num_classes >= max_classes) { expand_array(); diff --git a/opal/class/ompi_object.h b/opal/class/opal_object.h similarity index 81% rename from opal/class/ompi_object.h rename to opal/class/opal_object.h index 45ceff8164..3187a8f1e4 100644 --- a/opal/class/ompi_object.h +++ b/opal/class/opal_object.h @@ -51,7 +51,7 @@ * @endcode * This macro actually expands to * @code - * ompi_class_t sally_t_class = { + * opal_class_t sally_t_class = { * "sally_t", * OBJ_CLASS(parent_t), // pointer to parent_t_class * sally_construct, @@ -109,8 +109,8 @@ * @endcode */ -#ifndef OMPI_OBJECT_H -#define OMPI_OBJECT_H +#ifndef OPAL_OBJECT_H +#define OPAL_OBJECT_H #include #include @@ -134,10 +134,10 @@ /* typedefs ***********************************************************/ -typedef struct ompi_object_t ompi_object_t; -typedef struct ompi_class_t ompi_class_t; -typedef void (*ompi_construct_t) (ompi_object_t *); -typedef void (*ompi_destruct_t) (ompi_object_t *); +typedef struct opal_object_t opal_object_t; +typedef struct opal_class_t opal_class_t; +typedef void (*opal_construct_t) (opal_object_t *); +typedef void (*opal_destruct_t) (opal_object_t *); /* types **************************************************************/ @@ -148,16 +148,16 @@ typedef void (*ompi_destruct_t) (ompi_object_t *); * There should be a single instance of this descriptor for each class * definition. */ -struct ompi_class_t { +struct opal_class_t { const char *cls_name; /**< symbolic name for class */ - ompi_class_t *cls_parent; /**< parent class descriptor */ - ompi_construct_t cls_construct; /**< class constructor */ - ompi_destruct_t cls_destruct; /**< class destructor */ + opal_class_t *cls_parent; /**< parent class descriptor */ + opal_construct_t cls_construct; /**< class constructor */ + opal_destruct_t cls_destruct; /**< class destructor */ int cls_initialized; /**< is class initialized */ int cls_depth; /**< depth of class hierarchy tree */ - ompi_construct_t *cls_construct_array; + opal_construct_t *cls_construct_array; /**< array of parent class constructors */ - ompi_destruct_t *cls_destruct_array; + opal_destruct_t *cls_destruct_array; /**< array of parent class destructors */ }; @@ -166,8 +166,8 @@ struct ompi_class_t { * * This is special and does not follow the pattern for other classes. */ -struct ompi_object_t { - ompi_class_t *obj_class; /**< class descriptor */ +struct opal_object_t { + opal_class_t *obj_class; /**< class descriptor */ volatile int obj_reference_count; /**< reference count */ #if OMPI_ENABLE_DEBUG const char* cls_init_file_name; /**< In debug mode store the file where the object get contructed */ @@ -198,11 +198,11 @@ struct ompi_object_t { * Put this in NAME.c */ #define OBJ_CLASS_INSTANCE(NAME, PARENT, CONSTRUCTOR, DESTRUCTOR) \ - ompi_class_t NAME ## _class = { \ + opal_class_t NAME ## _class = { \ # NAME, \ OBJ_CLASS(PARENT), \ - (ompi_construct_t) CONSTRUCTOR, \ - (ompi_destruct_t) DESTRUCTOR, \ + (opal_construct_t) CONSTRUCTOR, \ + (opal_destruct_t) DESTRUCTOR, \ 0, 0, NULL, NULL \ } @@ -215,7 +215,7 @@ struct ompi_object_t { * Put this in NAME.h */ #define OBJ_CLASS_DECLARATION(NAME) \ - extern ompi_class_t NAME ## _class + extern opal_class_t NAME ## _class /** @@ -225,20 +225,20 @@ struct ompi_object_t { * @param type Type (class) of the object * @return Pointer to the object */ -static inline ompi_object_t *ompi_obj_new(size_t size, ompi_class_t * cls); +static inline opal_object_t *opal_obj_new(size_t size, opal_class_t * cls); #if OMPI_ENABLE_DEBUG -static inline ompi_object_t *ompi_obj_new_debug(size_t obj_size, ompi_class_t* type, const char* file, int line) +static inline opal_object_t *opal_obj_new_debug(size_t obj_size, opal_class_t* type, const char* file, int line) { - ompi_object_t* object = ompi_obj_new(obj_size, type); + opal_object_t* object = opal_obj_new(obj_size, type); object->cls_init_file_name = file; object->cls_init_lineno = line; return object; } #define OBJ_NEW(type) \ - ((type *)ompi_obj_new_debug(sizeof(type), OBJ_CLASS(type), __FILE__, __LINE__)) + ((type *)opal_obj_new_debug(sizeof(type), OBJ_CLASS(type), __FILE__, __LINE__)) #else #define OBJ_NEW(type) \ - ((type *) ompi_obj_new(sizeof(type), OBJ_CLASS(type))) + ((type *) opal_obj_new(sizeof(type), OBJ_CLASS(type))) #endif /* OMPI_ENABLE_DEBUG */ /** @@ -249,11 +249,11 @@ static inline ompi_object_t *ompi_obj_new_debug(size_t obj_size, ompi_class_t* t #define OBJ_RETAIN(object) \ do { \ assert(NULL != object); \ - assert(NULL != ((ompi_object_t *) (object))->obj_class); \ + assert(NULL != ((opal_object_t *) (object))->obj_class); \ if (NULL != object) { \ - ompi_obj_update((ompi_object_t *) (object), 1); \ + opal_obj_update((opal_object_t *) (object), 1); \ } \ - assert(((ompi_object_t *) (object))->obj_reference_count >= 0); \ + assert(((opal_object_t *) (object))->obj_reference_count >= 0); \ } while (0) @@ -270,9 +270,9 @@ static inline ompi_object_t *ompi_obj_new_debug(size_t obj_size, ompi_class_t* t #define OBJ_RELEASE(object) \ do { \ assert(NULL != object); \ - assert(NULL != ((ompi_object_t *) (object))->obj_class); \ - if (0 == ompi_obj_update((ompi_object_t *) (object), -1)) { \ - ompi_obj_run_destructors((ompi_object_t *) (object)); \ + assert(NULL != ((opal_object_t *) (object))->obj_class); \ + if (0 == opal_obj_update((opal_object_t *) (object), -1)) { \ + opal_obj_run_destructors((opal_object_t *) (object)); \ free(object); \ object = NULL; \ } \ @@ -290,8 +290,8 @@ static inline ompi_object_t *ompi_obj_new_debug(size_t obj_size, ompi_class_t* t #define OBJ_CONSTRUCT(object, type) \ do { \ OBJ_CONSTRUCT_INTERNAL((object), OBJ_CLASS(type)); \ - ((ompi_object_t *)(object))->cls_init_file_name = __FILE__; \ - ((ompi_object_t *)(object))->cls_init_lineno = __LINE__; \ + ((opal_object_t *)(object))->cls_init_file_name = __FILE__; \ + ((opal_object_t *)(object))->cls_init_lineno = __LINE__; \ } while (0) #else #define OBJ_CONSTRUCT(object, type) \ @@ -301,12 +301,12 @@ do { \ #define OBJ_CONSTRUCT_INTERNAL(object, type) \ do { \ if (0 == (type)->cls_initialized) { \ - ompi_class_initialize((type)); \ + opal_class_initialize((type)); \ } \ if (NULL != object) { \ - ((ompi_object_t *) (object))->obj_class = (type); \ - ((ompi_object_t *) (object))->obj_reference_count = 1; \ - ompi_obj_run_constructors((ompi_object_t *) (object)); \ + ((opal_object_t *) (object))->obj_class = (type); \ + ((opal_object_t *) (object))->obj_reference_count = 1; \ + opal_obj_run_constructors((opal_object_t *) (object)); \ } \ } while (0) @@ -319,12 +319,12 @@ do { \ #define OBJ_DESTRUCT(object) \ do { \ if (NULL != object) { \ - ompi_obj_run_destructors((ompi_object_t *) (object)); \ + opal_obj_run_destructors((opal_object_t *) (object)); \ } \ } while (0) BEGIN_C_DECLS -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(ompi_object_t); +OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_object_t); /* declarations *******************************************************/ @@ -337,7 +337,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(ompi_object_t); * * @param class Pointer to class descriptor */ -OMPI_DECLSPEC void ompi_class_initialize(ompi_class_t *); +OMPI_DECLSPEC void opal_class_initialize(opal_class_t *); /** * Shut down the class system and release all memory @@ -348,7 +348,7 @@ OMPI_DECLSPEC void ompi_class_initialize(ompi_class_t *); * tools like valgrind and purify don't report still-reachable memory * upon process termination. */ -OMPI_DECLSPEC int ompi_class_finalize(void); +OMPI_DECLSPEC int opal_class_finalize(void); END_C_DECLS /** @@ -363,9 +363,9 @@ END_C_DECLS * Hardwired for fairly shallow inheritance trees * @param size Pointer to the object. */ -static inline void ompi_obj_run_constructors(ompi_object_t * object) +static inline void opal_obj_run_constructors(opal_object_t * object) { - ompi_class_t *cls; + opal_class_t *cls; int i; assert(NULL != object); @@ -388,9 +388,9 @@ static inline void ompi_obj_run_constructors(ompi_object_t * object) * * @param size Pointer to the object. */ -static inline void ompi_obj_run_destructors(ompi_object_t * object) +static inline void opal_obj_run_destructors(opal_object_t * object) { - ompi_class_t *cls; + opal_class_t *cls; int i; assert(NULL != object); @@ -415,20 +415,20 @@ static inline void ompi_obj_run_destructors(ompi_object_t * object) * @param cls Pointer to the class descriptor of this object * @return Pointer to the object */ -static inline ompi_object_t *ompi_obj_new(size_t size, ompi_class_t * cls) +static inline opal_object_t *opal_obj_new(size_t size, opal_class_t * cls) { - ompi_object_t *object; + opal_object_t *object; - assert(size >= sizeof(ompi_object_t)); + assert(size >= sizeof(opal_object_t)); - object = (ompi_object_t *) malloc(size); + object = (opal_object_t *) malloc(size); if (0 == cls->cls_initialized) { - ompi_class_initialize(cls); + opal_class_initialize(cls); } if (NULL != object) { object->obj_class = cls; object->obj_reference_count = 1; - ompi_obj_run_constructors(object); + opal_obj_run_constructors(object); } return object; } @@ -444,7 +444,7 @@ static inline ompi_object_t *ompi_obj_new(size_t size, ompi_class_t * cls) * @param inc Increment by which to update reference count * @return New value of the reference count */ -static inline int ompi_obj_update(ompi_object_t *object, int inc) +static inline int opal_obj_update(opal_object_t *object, int inc) { #if OMPI_HAVE_THREAD_SUPPORT ompi_atomic_add(&(object->obj_reference_count), inc ); @@ -457,4 +457,4 @@ static inline int ompi_obj_update(ompi_object_t *object, int inc) /**********************************************************************/ -#endif /* OMPI_OBJECT_H */ +#endif /* OPAL_OBJECT_H */ diff --git a/opal/event/event.c b/opal/event/event.c index 51890afdbb..4b90d86ae3 100644 --- a/opal/event/event.c +++ b/opal/event/event.c @@ -61,7 +61,7 @@ #include "event.h" #include "include/types.h" #include "include/constants.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "threads/mutex.h" #include "threads/thread.h" #include "util/output.h" @@ -207,7 +207,7 @@ static int ompi_timeout_next(struct timeval *tv) #if OMPI_ENABLE_PROGRESS_THREADS /* run loop for dispatch thread */ -static void* ompi_event_run(ompi_object_t* arg) +static void* ompi_event_run(opal_object_t* arg) { /* Open MPI: Prevent compiler warnings about unused variables */ #if defined(NDEBUG) diff --git a/opal/include/sys/numa.h b/opal/include/sys/numa.h index 990bf2ccb4..2877bd36f1 100644 --- a/opal/include/sys/numa.h +++ b/opal/include/sys/numa.h @@ -15,7 +15,7 @@ */ #include "include/constants.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" typedef int affinity_t; diff --git a/opal/mca/base/base.h b/opal/mca/base/base.h index c31655143f..50f67105a7 100644 --- a/opal/mca/base/base.h +++ b/opal/mca/base/base.h @@ -21,7 +21,7 @@ #include "libltdl/ltdl.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" /* * These units are large enough to warrant their own .h files diff --git a/opal/mca/base/mca_base_component_repository.c b/opal/mca/base/mca_base_component_repository.c index 8a40745359..bd2ebf58a0 100644 --- a/opal/mca/base/mca_base_component_repository.c +++ b/opal/mca/base/mca_base_component_repository.c @@ -44,8 +44,8 @@ struct repository_item_t { ompi_list_t ri_dependencies; }; typedef struct repository_item_t repository_item_t; -static void ri_constructor(ompi_object_t *obj); -static void ri_destructor(ompi_object_t *obj); +static void ri_constructor(opal_object_t *obj); +static void ri_destructor(opal_object_t *obj); static OBJ_CLASS_INSTANCE(repository_item_t, ompi_list_item_t, ri_constructor, ri_destructor); @@ -55,8 +55,8 @@ struct dependency_item_t { repository_item_t *di_repository_entry; }; typedef struct dependency_item_t dependency_item_t; -static void di_constructor(ompi_object_t *obj); -static void di_destructor(ompi_object_t *obj); +static void di_constructor(opal_object_t *obj); +static void di_destructor(opal_object_t *obj); static OBJ_CLASS_INSTANCE(dependency_item_t, ompi_list_item_t, di_constructor, di_destructor); @@ -289,7 +289,7 @@ static int link_items(repository_item_t *src, repository_item_t *depend) /* * Basic sentinel values, and construct the inner list */ -static void ri_constructor(ompi_object_t *obj) +static void ri_constructor(opal_object_t *obj) { repository_item_t *ri = (repository_item_t *) obj; @@ -304,7 +304,7 @@ static void ri_constructor(ompi_object_t *obj) /* * Close a component */ -static void ri_destructor(ompi_object_t *obj) +static void ri_destructor(opal_object_t *obj) { repository_item_t *ri = (repository_item_t *) obj; dependency_item_t *di; @@ -336,7 +336,7 @@ static void ri_destructor(ompi_object_t *obj) /* * Basic sentinel values */ -static void di_constructor(ompi_object_t *obj) +static void di_constructor(opal_object_t *obj) { dependency_item_t *di = (dependency_item_t *) obj; @@ -348,7 +348,7 @@ static void di_constructor(ompi_object_t *obj) * When a dependency item is released, go release the repository entry * that it points to */ -static void di_destructor(ompi_object_t *obj) +static void di_destructor(opal_object_t *obj) { dependency_item_t *di = (dependency_item_t *) obj; diff --git a/opal/mca/base/mca_base_list.c b/opal/mca/base/mca_base_list.c index c66d638b4d..f28cdc7c2d 100644 --- a/opal/mca/base/mca_base_list.c +++ b/opal/mca/base/mca_base_list.c @@ -23,8 +23,8 @@ /* * Local functions */ -static void cl_constructor(ompi_object_t *obj); -static void cpl_constructor(ompi_object_t *obj); +static void cl_constructor(opal_object_t *obj); +static void cpl_constructor(opal_object_t *obj); /* @@ -44,7 +44,7 @@ OBJ_CLASS_INSTANCE(mca_base_component_priority_list_item_t, /* * Just do basic sentinel intialization */ -static void cl_constructor(ompi_object_t *obj) +static void cl_constructor(opal_object_t *obj) { mca_base_component_list_item_t *cli = (mca_base_component_list_item_t *) obj; cli->cli_component = NULL; @@ -54,7 +54,7 @@ static void cl_constructor(ompi_object_t *obj) /* * Just do basic sentinel intialization */ -static void cpl_constructor(ompi_object_t *obj) +static void cpl_constructor(opal_object_t *obj) { mca_base_component_priority_list_item_t *cpli = (mca_base_component_priority_list_item_t *) obj; diff --git a/opal/mca/base/mca_base_msgbuf_internal.h b/opal/mca/base/mca_base_msgbuf_internal.h index 5d2aff5885..ce46752b1b 100644 --- a/opal/mca/base/mca_base_msgbuf_internal.h +++ b/opal/mca/base/mca_base_msgbuf_internal.h @@ -30,7 +30,7 @@ * data structures */ -/* this struct is changing to be a ompi_object with a ompi_list inside! */ +/* this struct is changing to be a opal_object with a ompi_list inside! */ /* and a few locks */ struct mca_base_msgbuffer_s { int msg_buff_id; /* internal ID of this buffer */ diff --git a/opal/mca/base/mca_base_param.c b/opal/mca/base/mca_base_param.c index dccafd0064..a3ba821fed 100644 --- a/opal/mca/base/mca_base_param.c +++ b/opal/mca/base/mca_base_param.c @@ -94,7 +94,7 @@ static void info_destructor(mca_base_param_info_t *p); /* * Make the class instance for mca_base_param_t */ -OBJ_CLASS_INSTANCE(mca_base_param_t, ompi_object_t, +OBJ_CLASS_INSTANCE(mca_base_param_t, opal_object_t, param_constructor, param_destructor); OBJ_CLASS_INSTANCE(mca_base_param_file_value_t, ompi_list_item_t, fv_constructor, fv_destructor); diff --git a/opal/mca/base/mca_base_param_internal.h b/opal/mca/base/mca_base_param_internal.h index fb6226a90b..802d1a11f8 100644 --- a/opal/mca/base/mca_base_param_internal.h +++ b/opal/mca/base/mca_base_param_internal.h @@ -32,7 +32,7 @@ #include "ompi_config.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "class/ompi_list.h" #include "class/ompi_hash_table.h" #include "mca/base/mca_base_param.h" @@ -58,7 +58,7 @@ typedef union { */ struct mca_base_param_t { /** Allow this to be an OMPI OBJ */ - ompi_object_t mbp_super; + opal_object_t mbp_super; /** Enum indicating the type of the parameter (integer or string) */ mca_base_param_type_t mbp_type; diff --git a/opal/runtime/opal_finalize.c b/opal/runtime/opal_finalize.c index 5e64f6e0e8..40a6265794 100644 --- a/opal/runtime/opal_finalize.c +++ b/opal/runtime/opal_finalize.c @@ -19,7 +19,7 @@ #include "orte_config.h" #include "include/orte_constants.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "util/output.h" #include "util/malloc.h" #include "mca/base/base.h" @@ -43,7 +43,7 @@ int opal_finalize(void) ompi_output_finalize(); /* finalize the class/object system */ - ompi_class_finalize(); + opal_class_finalize(); /* finalize the memory allocator */ ompi_malloc_finalize(); diff --git a/opal/threads/condition.c b/opal/threads/condition.c index 4782b5a987..1433b1950a 100644 --- a/opal/threads/condition.c +++ b/opal/threads/condition.c @@ -38,6 +38,6 @@ static void ompi_condition_destruct(ompi_condition_t *c) } OBJ_CLASS_INSTANCE(ompi_condition_t, - ompi_object_t, + opal_object_t, ompi_condition_construct, ompi_condition_destruct); diff --git a/opal/threads/condition.h b/opal/threads/condition.h index 3aa2844b34..b13703f5c3 100644 --- a/opal/threads/condition.h +++ b/opal/threads/condition.h @@ -41,7 +41,7 @@ extern "C" { */ struct ompi_condition_t { - ompi_object_t super; + opal_object_t super; volatile int c_waiting; volatile int c_signaled; #if OMPI_HAVE_POSIX_THREADS diff --git a/opal/threads/condition_pthread.c b/opal/threads/condition_pthread.c index 815490f8d1..731e9f0bd2 100644 --- a/opal/threads/condition_pthread.c +++ b/opal/threads/condition_pthread.c @@ -32,7 +32,7 @@ static void ompi_condition_destruct(ompi_condition_t *c) } OBJ_CLASS_INSTANCE(ompi_condition_t, - ompi_object_t, + opal_object_t, ompi_condition_construct, ompi_condition_destruct); diff --git a/opal/threads/condition_pthread.h b/opal/threads/condition_pthread.h index 92c722bb6b..cdc7814a36 100644 --- a/opal/threads/condition_pthread.h +++ b/opal/threads/condition_pthread.h @@ -25,7 +25,7 @@ extern "C" { #endif struct ompi_condition_t { - ompi_object_t super; + opal_object_t super; pthread_cond_t c_cond; }; typedef struct ompi_condition_t ompi_condition_t; diff --git a/opal/threads/condition_spinlock.c b/opal/threads/condition_spinlock.c index 204b417ecd..8be0aa02da 100644 --- a/opal/threads/condition_spinlock.c +++ b/opal/threads/condition_spinlock.c @@ -34,7 +34,7 @@ static void ompi_condition_destruct(ompi_condition_t *c) OBJ_CLASS_INSTANCE(ompi_condition_t, - ompi_object_t, + opal_object_t, ompi_condition_construct, ompi_condition_destruct); diff --git a/opal/threads/condition_spinlock.h b/opal/threads/condition_spinlock.h index e921d4025e..40e95c2f08 100644 --- a/opal/threads/condition_spinlock.h +++ b/opal/threads/condition_spinlock.h @@ -30,7 +30,7 @@ extern "C" { struct ompi_condition_t { - ompi_object_t super; + opal_object_t super; volatile int c_waiting; volatile int c_signaled; }; diff --git a/opal/threads/mutex.c b/opal/threads/mutex.c index 72509a23be..9bdbf1dac3 100644 --- a/opal/threads/mutex.c +++ b/opal/threads/mutex.c @@ -59,6 +59,6 @@ static void ompi_mutex_destruct(ompi_mutex_t *m) #endif OBJ_CLASS_INSTANCE(ompi_mutex_t, - ompi_object_t, + opal_object_t, ompi_mutex_construct, ompi_mutex_destruct); diff --git a/opal/threads/mutex_unix.h b/opal/threads/mutex_unix.h index 1b6bc12490..2202a07bda 100644 --- a/opal/threads/mutex_unix.h +++ b/opal/threads/mutex_unix.h @@ -35,14 +35,14 @@ #endif #endif -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "include/sys/atomic.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { #endif struct ompi_mutex_t { - ompi_object_t super; + opal_object_t super; #if OMPI_HAVE_POSIX_THREADS pthread_mutex_t m_lock_pthread; #endif diff --git a/opal/threads/mutex_windows.h b/opal/threads/mutex_windows.h index ac89d1dd5b..b689718e88 100644 --- a/opal/threads/mutex_windows.h +++ b/opal/threads/mutex_windows.h @@ -27,14 +27,14 @@ * On Windows, base everything on InterlockedExchange(). */ -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "include/sys/atomic.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { #endif struct ompi_mutex_t { - ompi_object_t super; + opal_object_t super; volatile LONG m_lock; }; diff --git a/opal/threads/thread.c b/opal/threads/thread.c index bdf7872ecf..7738be1367 100644 --- a/opal/threads/thread.c +++ b/opal/threads/thread.c @@ -23,7 +23,7 @@ static void ompi_thread_construct(ompi_thread_t *t); OBJ_CLASS_INSTANCE(ompi_thread_t, - ompi_object_t, + opal_object_t, ompi_thread_construct, NULL); diff --git a/opal/threads/thread.h b/opal/threads/thread.h index 4f6509a9a2..459767b76d 100644 --- a/opal/threads/thread.h +++ b/opal/threads/thread.h @@ -25,16 +25,16 @@ #include #endif -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { #endif -typedef void *(*ompi_thread_fn_t) (ompi_object_t *); +typedef void *(*ompi_thread_fn_t) (opal_object_t *); struct ompi_thread_t { - ompi_object_t super; + opal_object_t super; ompi_thread_fn_t t_run; void* t_arg; #ifdef WIN32 diff --git a/opal/util/cmd_line.c b/opal/util/cmd_line.c index 07601ef623..5ae9bb76f0 100644 --- a/opal/util/cmd_line.c +++ b/opal/util/cmd_line.c @@ -21,7 +21,7 @@ #include #include "include/constants.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "class/ompi_list.h" #include "threads/mutex.h" #include "util/argv.h" @@ -105,7 +105,7 @@ static OBJ_CLASS_INSTANCE(cmd_line_param_t, static void cmd_line_constructor(ompi_cmd_line_t *cmd); static void cmd_line_destructor(ompi_cmd_line_t *cmd); OBJ_CLASS_INSTANCE(ompi_cmd_line_t, - ompi_object_t, + opal_object_t, cmd_line_constructor, cmd_line_destructor); diff --git a/opal/util/cmd_line.h b/opal/util/cmd_line.h index df904f1213..7f49ed6ca9 100644 --- a/opal/util/cmd_line.h +++ b/opal/util/cmd_line.h @@ -110,7 +110,7 @@ #include "ompi_config.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "class/ompi_list.h" #include "threads/mutex.h" @@ -124,7 +124,7 @@ extern "C" { */ struct ompi_cmd_line_t { /** Make this an OBJ handle */ - ompi_object_t super; + opal_object_t super; /** Thread safety */ ompi_mutex_t lcl_mutex; diff --git a/orte/class/orte_bitmap.c b/orte/class/orte_bitmap.c index 9791cbdcf1..a47a328e8b 100644 --- a/orte/class/orte_bitmap.c +++ b/orte/class/orte_bitmap.c @@ -29,7 +29,7 @@ static void orte_bitmap_construct(orte_bitmap_t *bm); static void orte_bitmap_destruct(orte_bitmap_t *bm); -OBJ_CLASS_INSTANCE(orte_bitmap_t, ompi_object_t, +OBJ_CLASS_INSTANCE(orte_bitmap_t, opal_object_t, orte_bitmap_construct, orte_bitmap_destruct); diff --git a/orte/class/orte_bitmap.h b/orte/class/orte_bitmap.h index 973211a285..78491cdc62 100644 --- a/orte/class/orte_bitmap.h +++ b/orte/class/orte_bitmap.h @@ -39,13 +39,13 @@ #include #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 orte_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 */ size_t array_size; /**< The actual array size that maintains the bitmap */ size_t legal_numbits; /**< The number of bits which are legal (the diff --git a/orte/class/orte_pointer_array.c b/orte/class/orte_pointer_array.c index e53c2fcc9b..e561d8f529 100644 --- a/orte/class/orte_pointer_array.c +++ b/orte/class/orte_pointer_array.c @@ -29,7 +29,7 @@ static void orte_pointer_array_construct(orte_pointer_array_t *); static void orte_pointer_array_destruct(orte_pointer_array_t *); static bool grow_table(orte_pointer_array_t *table); -OBJ_CLASS_INSTANCE(orte_pointer_array_t, ompi_object_t, +OBJ_CLASS_INSTANCE(orte_pointer_array_t, opal_object_t, orte_pointer_array_construct, orte_pointer_array_destruct); diff --git a/orte/class/orte_pointer_array.h b/orte/class/orte_pointer_array.h index 40e907c36f..2410c2d0c9 100644 --- a/orte/class/orte_pointer_array.h +++ b/orte/class/orte_pointer_array.h @@ -25,7 +25,7 @@ #include "orte_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" { @@ -36,7 +36,7 @@ extern "C" { */ struct orte_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 diff --git a/orte/class/orte_value_array.c b/orte/class/orte_value_array.c index aa04e5c6cf..735f405b49 100644 --- a/orte/class/orte_value_array.c +++ b/orte/class/orte_value_array.c @@ -34,11 +34,11 @@ static void orte_value_array_destruct(orte_value_array_t* array) free(array->array_items); } -ompi_class_t orte_value_array_t_class = { +opal_class_t orte_value_array_t_class = { "orte_value_array_t", - OBJ_CLASS(ompi_object_t), - (ompi_construct_t)orte_value_array_construct, - (ompi_destruct_t)orte_value_array_destruct + OBJ_CLASS(opal_object_t), + (opal_construct_t)orte_value_array_construct, + (opal_destruct_t)orte_value_array_destruct }; diff --git a/orte/class/orte_value_array.h b/orte/class/orte_value_array.h index 83a959314e..f072ec7fbc 100644 --- a/orte/class/orte_value_array.h +++ b/orte/class/orte_value_array.h @@ -21,7 +21,7 @@ #include "orte_config.h" #include "include/orte_constants.h" #include "include/orte_types.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #if OMPI_ENABLE_DEBUG #include "util/output.h" #endif @@ -36,12 +36,12 @@ extern "C" { #endif -OMPI_DECLSPEC extern ompi_class_t orte_value_array_t_class; +OMPI_DECLSPEC extern opal_class_t orte_value_array_t_class; struct orte_value_array_t { - ompi_object_t super; + opal_object_t super; unsigned char* array_items; size_t array_item_sizeof; size_t array_size; diff --git a/orte/dps/dps_types.h b/orte/dps/dps_types.h index 9642c432fb..b7cab2a961 100644 --- a/orte/dps/dps_types.h +++ b/orte/dps/dps_types.h @@ -25,7 +25,7 @@ #include "orte_config.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { @@ -37,7 +37,7 @@ extern "C" { */ struct orte_buffer_t { /** First member must be the object's parent */ - ompi_object_t parent; + opal_object_t parent; /** Start of my memory */ char *base_ptr; diff --git a/orte/dps/orte_dps_open_close.c b/orte/dps/orte_dps_open_close.c index c45d14729d..b44f545557 100644 --- a/orte/dps/orte_dps_open_close.c +++ b/orte/dps/orte_dps_open_close.c @@ -69,7 +69,7 @@ static void orte_buffer_destruct (orte_buffer_t* buffer) } OBJ_CLASS_INSTANCE(orte_buffer_t, - ompi_object_t, + opal_object_t, orte_buffer_construct, orte_buffer_destruct); diff --git a/orte/include/orte_types.h b/orte/include/orte_types.h index fd7afce900..a5e3c69394 100644 --- a/orte/include/orte_types.h +++ b/orte/include/orte_types.h @@ -17,7 +17,7 @@ #ifndef ORTE_TYPES_H #define ORTE_TYPES_H -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" /** * Supported datatypes for messaging and storage operations. diff --git a/orte/mca/gpr/base/gpr_base_open.c b/orte/mca/gpr/base/gpr_base_open.c index fe311be665..4dc5ab6c9a 100644 --- a/orte/mca/gpr/base/gpr_base_open.c +++ b/orte/mca/gpr/base/gpr_base_open.c @@ -70,10 +70,10 @@ static void orte_gpr_keyval_destructor(orte_gpr_keyval_t* keyval) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_keyval_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_keyval_construct, /* constructor */ orte_gpr_keyval_destructor); /* destructor */ @@ -117,10 +117,10 @@ static void orte_gpr_value_destructor(orte_gpr_value_t* reg_val) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_value_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_value_construct, /* constructor */ orte_gpr_value_destructor); /* destructor */ @@ -148,10 +148,10 @@ static void orte_gpr_notify_data_destructor(orte_gpr_notify_data_t* ptr) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_notify_data_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_notify_data_construct, /* constructor */ orte_gpr_notify_data_destructor); /* destructor */ @@ -184,10 +184,10 @@ static void orte_gpr_subscription_destructor(orte_gpr_subscription_t* sub) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_subscription_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_subscription_construct, /* constructor */ orte_gpr_subscription_destructor); /* destructor */ @@ -217,10 +217,10 @@ static void orte_gpr_trigger_destructor(orte_gpr_trigger_t* trig) } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_trigger_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_trigger_construct, /* constructor */ orte_gpr_trigger_destructor); /* destructor */ @@ -247,10 +247,10 @@ static void orte_gpr_notify_message_destructor(orte_gpr_notify_message_t* msg) } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_notify_message_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_notify_message_construct, /* constructor */ orte_gpr_notify_message_destructor); /* destructor */ diff --git a/orte/mca/gpr/gpr_types.h b/orte/mca/gpr/gpr_types.h index f2c3bced97..7cb12e1f39 100644 --- a/orte/mca/gpr/gpr_types.h +++ b/orte/mca/gpr/gpr_types.h @@ -36,7 +36,7 @@ #endif #include "mca/schema/schema.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "dps/dps_types.h" #include "mca/ns/ns_types.h" #include "mca/rmgr/rmgr_types.h" @@ -146,7 +146,7 @@ typedef union { /* shared storage for the value */ * Key-value pairs for registry operations */ typedef struct { - ompi_object_t super; /* required for this to be an object */ + opal_object_t super; /* required for this to be an object */ char *key; /* string key for this value */ orte_data_type_t type; /* the type of value stored */ orte_gpr_value_union_t value; @@ -167,7 +167,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_keyval_t); * the structure can be re-used by the put command. */ typedef struct { - ompi_object_t super; /**< Makes this an object */ + opal_object_t super; /**< Makes this an object */ orte_gpr_addr_mode_t addr_mode; /**< Address mode that was used for combining keys/tokens */ char *segment; /**< Name of the segment this came from */ size_t cnt; /**< Number of keyval objects returned */ @@ -184,7 +184,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_value_t); * data from a single segment, one or more containers with one or more keyvals/container. */ typedef struct { - ompi_object_t super; /**< Makes this an object */ + opal_object_t super; /**< Makes this an object */ orte_gpr_subscription_id_t id; /**< Number of the associated subscription */ size_t cnt; /**< Number of value objects returned, one per container */ orte_gpr_value_t **values; /**< Array of value objects returned */ @@ -195,7 +195,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_notify_data_t); /** Return message for notify requests */ typedef struct { - ompi_object_t super; /**< Make this an object */ + opal_object_t super; /**< Make this an object */ size_t cnt; /**< number of data objects */ orte_gpr_notify_data_t **data; /**< Contiguous array of pointers to data objects */ } orte_gpr_notify_message_t; @@ -219,7 +219,7 @@ typedef void (*orte_gpr_notify_cb_fn_t)(orte_gpr_notify_data_t *notify_data, voi * addr_mode to locate and return the data. */ typedef struct { - ompi_object_t super; /**< Makes this an object */ + opal_object_t super; /**< Makes this an object */ char *name; /**< A unique name for this subscription - can be NULL */ orte_gpr_subscription_id_t id; /**< id number of this subscription, as assigned by system */ orte_gpr_notify_action_t action; /**< what causes subscription to fire */ @@ -239,7 +239,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_subscription_t); * exist between those objects for the trigger to be "fired". */ typedef struct { - ompi_object_t super; /**< Makes this an object */ + opal_object_t super; /**< Makes this an object */ char *name; /**< A unique name for this trigger - can be NULL */ orte_gpr_trigger_id_t id; /**< id number of this trigger, as assigned by system */ orte_gpr_trigger_action_t action; /**< trigger characteristics */ diff --git a/orte/mca/gpr/proxy/gpr_proxy.h b/orte/mca/gpr/proxy/gpr_proxy.h index 6c4244fa19..b234a3c2a3 100644 --- a/orte/mca/gpr/proxy/gpr_proxy.h +++ b/orte/mca/gpr/proxy/gpr_proxy.h @@ -22,7 +22,7 @@ #include "orte_config.h" #include "include/orte_types.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "class/orte_pointer_array.h" #include "dps/dps_types.h" #include "util/proc_info.h" @@ -53,7 +53,7 @@ int orte_gpr_proxy_finalize(void); * proxy-local types */ typedef struct { - ompi_object_t super; /**< Allows this to be an object */ + opal_object_t super; /**< Allows this to be an object */ orte_gpr_subscription_id_t id; /**< id of this subscription */ orte_gpr_notify_cb_fn_t callback; /**< Function to be called for notificaiton */ void *user_tag; /**< User-provided tag for callback function */ diff --git a/orte/mca/gpr/proxy/gpr_proxy_component.c b/orte/mca/gpr/proxy/gpr_proxy_component.c index c16493d42a..b3db328eb6 100644 --- a/orte/mca/gpr/proxy/gpr_proxy_component.c +++ b/orte/mca/gpr/proxy/gpr_proxy_component.c @@ -132,10 +132,10 @@ static void orte_gpr_proxy_subscriber_destructor(orte_gpr_proxy_subscriber_t* re { } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_proxy_subscriber_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_proxy_subscriber_construct, /* constructor */ orte_gpr_proxy_subscriber_destructor); /* destructor */ diff --git a/orte/mca/gpr/replica/functional_layer/gpr_replica_segment_fn.c b/orte/mca/gpr/replica/functional_layer/gpr_replica_segment_fn.c index 5544d18a70..0a484cdb94 100644 --- a/orte/mca/gpr/replica/functional_layer/gpr_replica_segment_fn.c +++ b/orte/mca/gpr/replica/functional_layer/gpr_replica_segment_fn.c @@ -25,7 +25,7 @@ #include "orte_config.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "util/output.h" #include "util/argv.h" #include "mca/errmgr/errmgr.h" diff --git a/orte/mca/gpr/replica/gpr_replica.h b/orte/mca/gpr/replica/gpr_replica.h index 8433922f44..6241ea6c04 100644 --- a/orte/mca/gpr/replica/gpr_replica.h +++ b/orte/mca/gpr/replica/gpr_replica.h @@ -82,7 +82,7 @@ typedef int8_t orte_gpr_replica_action_t; * that are operating on the same node as the replica */ typedef struct { - ompi_object_t super; /**< Allows this to be an object */ + opal_object_t super; /**< Allows this to be an object */ orte_gpr_subscription_id_t id; /**< id of this subscription */ orte_gpr_notify_cb_fn_t callback; /**< Function to be called for notificaiton */ void *user_tag; /**< User-provided tag for callback function */ @@ -157,7 +157,7 @@ typedef struct orte_gpr_replica_t orte_gpr_replica_t; * to avoid naming conflicts between tokens from CommWorlds sharing a given universe. */ struct orte_gpr_replica_segment_t { - ompi_object_t super; /**< Make this an object */ + opal_object_t super; /**< Make this an object */ char *name; /**< Name of the segment */ orte_gpr_replica_itag_t itag; /**< itag of this segment */ size_t num_dict_entries; @@ -190,7 +190,7 @@ OBJ_CLASS_DECLARATION(orte_gpr_replica_segment_t); * "authorization" linked list of ID's and their access rights to this structure. */ struct orte_gpr_replica_container_t { - ompi_object_t super; /**< Make this an object */ + opal_object_t super; /**< Make this an object */ size_t index; /**< Location in the pointer array */ orte_gpr_replica_itag_t *itags; /**< Array of itags that define this container */ size_t num_itags; /**< Number of itags in array */ @@ -206,7 +206,7 @@ OBJ_CLASS_DECLARATION(orte_gpr_replica_container_t); /* The itag-value pair for storing data entries in the registry */ typedef struct { - ompi_object_t super; /**< required for this to be an object */ + opal_object_t super; /**< required for this to be an object */ size_t index; /**< index of this itagval on the container array */ orte_gpr_replica_itag_t itag; /**< itag for this value's key */ orte_data_type_t type; /**< the type of value stored */ @@ -219,7 +219,7 @@ OBJ_CLASS_DECLARATION(orte_gpr_replica_itagval_t); * itags for the tokens/keys and pointers to internal structures */ typedef struct { - ompi_object_t super; /**< Makes this an object */ + opal_object_t super; /**< Makes this an object */ size_t index; /* the segment upon which this data is located */ orte_gpr_replica_segment_t *seg; @@ -233,7 +233,7 @@ OBJ_CLASS_DECLARATION(orte_gpr_replica_ivalue_t); typedef struct { - ompi_object_t super; + opal_object_t super; orte_gpr_replica_segment_t *seg; orte_gpr_replica_container_t *cptr; orte_gpr_replica_itagval_t *iptr; @@ -243,7 +243,7 @@ typedef struct { OBJ_CLASS_DECLARATION(orte_gpr_replica_counter_t); typedef struct { - ompi_object_t super; + opal_object_t super; /* index of this entry in requestor array */ size_t index; /* process name of the recipient - set to NULL if local */ @@ -258,7 +258,7 @@ typedef struct { OBJ_CLASS_DECLARATION(orte_gpr_replica_requestor_t); typedef struct { - ompi_object_t super; /**< Makes this an object */ + opal_object_t super; /**< Makes this an object */ /* index of this entry in subscription array - corresponds to local idtag */ size_t index; /* name of this subscription, if provided */ @@ -292,7 +292,7 @@ OBJ_CLASS_DECLARATION(orte_gpr_replica_subscription_t); typedef struct { - ompi_object_t super; + opal_object_t super; /* index of this entry in array */ size_t index; /* process name of the requestor - set to NULL if local */ @@ -305,7 +305,7 @@ OBJ_CLASS_DECLARATION(orte_gpr_replica_trigger_requestor_t); struct orte_gpr_replica_trigger_t { - ompi_object_t super; /**< Make this an object */ + opal_object_t super; /**< Make this an object */ /* name of this trigger, if provided */ char *name; /* index of this trigger in the triggers array - corresponds to local idtag */ @@ -347,7 +347,7 @@ OBJ_CLASS_DECLARATION(orte_gpr_replica_trigger_t); * processing notification subscriptions. */ typedef struct { - ompi_object_t super; /**< Make this an object */ + opal_object_t super; /**< Make this an object */ orte_gpr_replica_action_t action; orte_gpr_replica_segment_t *seg; orte_gpr_replica_container_t *cptr; diff --git a/orte/mca/gpr/replica/gpr_replica_class_instances.h b/orte/mca/gpr/replica/gpr_replica_class_instances.h index 65b784cc5a..d0e9e7f5bd 100644 --- a/orte/mca/gpr/replica/gpr_replica_class_instances.h +++ b/orte/mca/gpr/replica/gpr_replica_class_instances.h @@ -24,7 +24,7 @@ #include "orte_config.h" #include "class/orte_bitmap.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "gpr_replica.h" @@ -38,7 +38,7 @@ * define instance */ OBJ_CLASS_INSTANCE( orte_gpr_replica_local_subscriber_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ NULL, /* constructor */ NULL); /* destructor */ @@ -104,7 +104,7 @@ static void orte_gpr_replica_segment_destructor(orte_gpr_replica_segment_t* seg) /* define instance of orte_gpr_replica_segment_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_segment_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_segment_construct, /* constructor */ orte_gpr_replica_segment_destructor); /* destructor */ @@ -153,10 +153,10 @@ static void orte_gpr_replica_container_destructor(orte_gpr_replica_container_t* } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_container_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_container_construct, /* constructor */ orte_gpr_replica_container_destructor); /* destructor */ @@ -185,10 +185,10 @@ static void orte_gpr_replica_itagval_destructor(orte_gpr_replica_itagval_t* ptr) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_itagval_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_itagval_construct, /* constructor */ orte_gpr_replica_itagval_destructor); /* destructor */ @@ -216,10 +216,10 @@ static void orte_gpr_replica_ivalue_destructor(orte_gpr_replica_ivalue_t* ptr) OBJ_DESTRUCT(&(ptr->keytags)); } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_ivalue_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_ivalue_construct, /* constructor */ orte_gpr_replica_ivalue_destructor); /* destructor */ @@ -240,10 +240,10 @@ static void orte_gpr_replica_counter_destructor(orte_gpr_replica_counter_t* cntr OBJ_DESTRUCT(&(cntr->trigger_level)); } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_counter_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_counter_construct, /* constructor */ orte_gpr_replica_counter_destructor); /* destructor */ @@ -263,10 +263,10 @@ static void orte_gpr_replica_requestor_destructor(orte_gpr_replica_requestor_t* if (NULL != ptr->requestor) free(ptr->requestor); } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_requestor_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_requestor_construct, /* constructor */ orte_gpr_replica_requestor_destructor); /* destructor */ @@ -326,10 +326,10 @@ static void orte_gpr_replica_subscription_destructor(orte_gpr_replica_subscripti } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_subscription_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_subscription_construct, /* constructor */ orte_gpr_replica_subscription_destructor); /* destructor */ @@ -349,10 +349,10 @@ static void orte_gpr_replica_trigger_requestor_destructor(orte_gpr_replica_trigg if (NULL != ptr->requestor) free(ptr->requestor); } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_trigger_requestor_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_trigger_requestor_construct, /* constructor */ orte_gpr_replica_trigger_requestor_destructor); /* destructor */ @@ -435,10 +435,10 @@ static void orte_gpr_replica_trigger_destructor(orte_gpr_replica_trigger_t* trig } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_trigger_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_trigger_construct, /* constructor */ orte_gpr_replica_trigger_destructor); /* destructor */ @@ -464,10 +464,10 @@ static void orte_gpr_replica_action_taken_destructor(orte_gpr_replica_action_tak if (NULL != ptr->iptr) OBJ_RELEASE(ptr->iptr); } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_action_taken_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_gpr_replica_action_taken_construct, /* constructor */ orte_gpr_replica_action_taken_destructor); /* destructor */ @@ -491,7 +491,7 @@ static void orte_gpr_replica_callbacks_destructor(orte_gpr_replica_callbacks_t* } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_callbacks_t, /* type name */ ompi_list_item_t, /* parent "class" name */ @@ -515,7 +515,7 @@ static void orte_gpr_replica_list_destructor(orte_gpr_replica_list_t* replica) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_list_t, /* type name */ ompi_list_item_t, /* parent "class" name */ @@ -524,7 +524,7 @@ OBJ_CLASS_INSTANCE( /* WRITE INVALIDATE - NOT IMPLEMENTED YET! */ -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_gpr_replica_write_invalidate_t, /* type name */ ompi_list_item_t, /* parent "class" name */ diff --git a/orte/mca/gpr/replica/gpr_replica_component.c b/orte/mca/gpr/replica/gpr_replica_component.c index f9e2b89700..80eea25818 100644 --- a/orte/mca/gpr/replica/gpr_replica_component.c +++ b/orte/mca/gpr/replica/gpr_replica_component.c @@ -26,7 +26,7 @@ #include "orte_config.h" #include "class/orte_bitmap.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "util/output.h" #include "util/proc_info.h" diff --git a/orte/mca/ns/base/ns_base_open.c b/orte/mca/ns/base/ns_base_open.c index 8f8fded49e..46c8eb9127 100644 --- a/orte/mca/ns/base/ns_base_open.c +++ b/orte/mca/ns/base/ns_base_open.c @@ -98,7 +98,7 @@ static void orte_name_services_namelist_destructor(orte_name_services_namelist_t } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_name_services_namelist_t, /* type name */ ompi_list_item_t, /* parent "class" name */ diff --git a/orte/mca/ns/proxy/src/ns_proxy_component.c b/orte/mca/ns/proxy/src/ns_proxy_component.c index 3ca47892ae..c4c34b024c 100644 --- a/orte/mca/ns/proxy/src/ns_proxy_component.c +++ b/orte/mca/ns/proxy/src/ns_proxy_component.c @@ -120,7 +120,7 @@ static void orte_ns_proxy_cell_info_destructor(orte_ns_proxy_cell_info_t* ptr) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_ns_proxy_cell_info_t, /* type name */ ompi_list_item_t, /* parent "class" name */ @@ -142,7 +142,7 @@ static void orte_ns_proxy_tagitem_destructor(orte_ns_proxy_tagitem_t* tagitem) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_ns_proxy_tagitem_t, /* type name */ ompi_list_item_t, /* parent "class" name */ @@ -164,7 +164,7 @@ static void orte_ns_proxy_dti_destructor(orte_ns_proxy_dti_t* dti) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_ns_proxy_dti_t, /* type name */ ompi_list_item_t, /* parent "class" name */ diff --git a/orte/mca/ns/replica/src/ns_replica_component.c b/orte/mca/ns/replica/src/ns_replica_component.c index f75ed439b4..ac2445a48b 100644 --- a/orte/mca/ns/replica/src/ns_replica_component.c +++ b/orte/mca/ns/replica/src/ns_replica_component.c @@ -121,7 +121,7 @@ static void orte_ns_replica_cell_tracker_destructor(orte_ns_replica_cell_tracker if (NULL != cell_tracker->resource) free(cell_tracker->resource); } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_ns_replica_cell_tracker_t, /* type name */ ompi_list_item_t, /* parent "class" name */ @@ -141,7 +141,7 @@ static void orte_ns_replica_tracker_destructor(orte_ns_replica_name_tracker_t* n { } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_ns_replica_name_tracker_t, /* type name */ ompi_list_item_t, /* parent "class" name */ @@ -164,7 +164,7 @@ static void orte_ns_replica_tagitem_destructor(orte_ns_replica_tagitem_t* tagite } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_ns_replica_tagitem_t, /* type name */ ompi_list_item_t, /* parent "class" name */ @@ -187,7 +187,7 @@ static void orte_ns_replica_dti_destructor(orte_ns_replica_dti_t* dti) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_ns_replica_dti_t, /* type name */ ompi_list_item_t, /* parent "class" name */ diff --git a/orte/mca/oob/tcp/oob_tcp_addr.c b/orte/mca/oob/tcp/oob_tcp_addr.c index 1e508bd6de..6a3ec45be8 100644 --- a/orte/mca/oob/tcp/oob_tcp_addr.c +++ b/orte/mca/oob/tcp/oob_tcp_addr.c @@ -51,7 +51,7 @@ static void mca_oob_tcp_addr_destruct(mca_oob_tcp_addr_t* addr) OBJ_CLASS_INSTANCE( mca_oob_tcp_addr_t, - ompi_object_t, + opal_object_t, mca_oob_tcp_addr_construct, mca_oob_tcp_addr_destruct); diff --git a/orte/mca/oob/tcp/oob_tcp_addr.h b/orte/mca/oob/tcp/oob_tcp_addr.h index 0105962de4..28aa9e21a5 100644 --- a/orte/mca/oob/tcp/oob_tcp_addr.h +++ b/orte/mca/oob/tcp/oob_tcp_addr.h @@ -29,7 +29,7 @@ #include #endif #include "dps/dps.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "mca/ns/ns_types.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { @@ -38,7 +38,7 @@ extern "C" { * Address info published to registry */ struct mca_oob_tcp_addr_t { - ompi_object_t super; + opal_object_t super; orte_process_name_t addr_name; uint32_t addr_count; uint32_t addr_next; diff --git a/orte/mca/pls/bproc_seed/pls_bproc_seed.c b/orte/mca/pls/bproc_seed/pls_bproc_seed.c index 38d929bcb2..fdd3b5fc7b 100644 --- a/orte/mca/pls/bproc_seed/pls_bproc_seed.c +++ b/orte/mca/pls/bproc_seed/pls_bproc_seed.c @@ -748,7 +748,7 @@ static void orte_pls_bproc_stack_destruct(orte_pls_bproc_stack_t* stack) static OBJ_CLASS_INSTANCE( orte_pls_bproc_stack_t, - ompi_object_t, + opal_object_t, orte_pls_bproc_stack_construct, orte_pls_bproc_stack_destruct); diff --git a/orte/mca/pls/fork/pls_fork_module.c b/orte/mca/pls/fork/pls_fork_module.c index 2d92441518..a6091c56fe 100644 --- a/orte/mca/pls/fork/pls_fork_module.c +++ b/orte/mca/pls/fork/pls_fork_module.c @@ -509,7 +509,7 @@ static void orte_pls_fork_stack_destruct(orte_pls_fork_stack_t* stack) static OBJ_CLASS_INSTANCE( orte_pls_fork_stack_t, - ompi_object_t, + opal_object_t, orte_pls_fork_stack_construct, orte_pls_fork_stack_destruct); diff --git a/orte/mca/pls/rsh/pls_rsh_module.c b/orte/mca/pls/rsh/pls_rsh_module.c index dccfd78271..d3bf01bf23 100644 --- a/orte/mca/pls/rsh/pls_rsh_module.c +++ b/orte/mca/pls/rsh/pls_rsh_module.c @@ -86,13 +86,13 @@ orte_pls_base_module_1_0_0_t orte_pls_rsh_module = { /* struct used to have enough information to clean up the state of the universe if a daemon aborts */ struct rsh_daemon_info_t { - ompi_object_t super; + opal_object_t super; orte_ras_base_node_t* node; orte_jobid_t jobid; }; typedef struct rsh_daemon_info_t rsh_daemon_info_t; static OBJ_CLASS_INSTANCE(rsh_daemon_info_t, - ompi_object_t, + opal_object_t, NULL, NULL); static void set_handler_default(int sig); @@ -767,7 +767,7 @@ static void orte_pls_rsh_stack_destruct(orte_pls_rsh_stack_t* stack) static OBJ_CLASS_INSTANCE( orte_pls_rsh_stack_t, - ompi_object_t, + opal_object_t, orte_pls_rsh_stack_construct, orte_pls_rsh_stack_destruct); diff --git a/orte/mca/rmaps/base/rmaps_base_map.c b/orte/mca/rmaps/base/rmaps_base_map.c index 6be9ca11d5..a45e7ec848 100644 --- a/orte/mca/rmaps/base/rmaps_base_map.c +++ b/orte/mca/rmaps/base/rmaps_base_map.c @@ -686,8 +686,8 @@ int orte_rmaps_base_set_vpid_range(orte_jobid_t jobid, orte_vpid_t start, orte_v { orte_gpr_value_t value; orte_gpr_value_t* values; - orte_gpr_keyval_t vpid_start = { {OBJ_CLASS(ompi_object_t),0}, ORTE_JOB_VPID_START_KEY, ORTE_VPID }; - orte_gpr_keyval_t vpid_range = { {OBJ_CLASS(ompi_object_t),0}, ORTE_JOB_VPID_RANGE_KEY, ORTE_VPID }; + orte_gpr_keyval_t vpid_start = { {OBJ_CLASS(opal_object_t),0}, ORTE_JOB_VPID_START_KEY, ORTE_VPID }; + orte_gpr_keyval_t vpid_range = { {OBJ_CLASS(opal_object_t),0}, ORTE_JOB_VPID_RANGE_KEY, ORTE_VPID }; orte_gpr_keyval_t* keyvals[2]; char* tokens[2] = { ORTE_JOB_GLOBALS, NULL }; int rc; diff --git a/orte/mca/rmgr/base/rmgr_base_open.c b/orte/mca/rmgr/base/rmgr_base_open.c index 24b7cd7c3e..fc13881e92 100644 --- a/orte/mca/rmgr/base/rmgr_base_open.c +++ b/orte/mca/rmgr/base/rmgr_base_open.c @@ -112,10 +112,10 @@ static void orte_app_context_destructor(orte_app_context_t* app_context) } } -/* define instance of ompi_class_t */ +/* define instance of opal_class_t */ OBJ_CLASS_INSTANCE( orte_app_context_t, /* type name */ - ompi_object_t, /* parent "class" name */ + opal_object_t, /* parent "class" name */ orte_app_context_construct, /* constructor */ orte_app_context_destructor); /* destructor */ @@ -135,7 +135,7 @@ static void orte_app_context_map_destruct(orte_app_context_map_t *a) OBJ_CLASS_INSTANCE(orte_app_context_map_t, - ompi_object_t, + opal_object_t, orte_app_context_map_construct, orte_app_context_map_destruct); diff --git a/orte/mca/rmgr/rmgr_types.h b/orte/mca/rmgr/rmgr_types.h index 19ab7d547b..3bf620449b 100644 --- a/orte/mca/rmgr/rmgr_types.h +++ b/orte/mca/rmgr/rmgr_types.h @@ -61,7 +61,7 @@ typedef uint32_t orte_rmgr_cmd_t; */ typedef struct { /** Parent object */ - ompi_object_t super; + opal_object_t super; /** One of the ORTE_APP_CONTEXT_MAP_* values */ uint8_t map_type; /** String data */ @@ -76,7 +76,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_app_context_map_t); */ typedef struct { /** Parent object */ - ompi_object_t super; + opal_object_t super; /** Unique index when multiple apps per job */ size_t idx; /** Absolute pathname of argv[0] */ diff --git a/orte/mca/schema/base/schema_base_fns.c b/orte/mca/schema/base/schema_base_fns.c index d4f61b9a59..8183482042 100644 --- a/orte/mca/schema/base/schema_base_fns.c +++ b/orte/mca/schema/base/schema_base_fns.c @@ -194,8 +194,8 @@ int orte_schema_base_store_my_info(void) { int rc = ORTE_SUCCESS; orte_gpr_value_t value, *values; - orte_gpr_keyval_t local_pid = { {OBJ_CLASS(ompi_object_t),0}, ORTE_PROC_LOCAL_PID_KEY, ORTE_PID }; - orte_gpr_keyval_t nodename = { {OBJ_CLASS(ompi_object_t),0}, ORTE_NODE_NAME_KEY, ORTE_STRING }; + orte_gpr_keyval_t local_pid = { {OBJ_CLASS(opal_object_t),0}, ORTE_PROC_LOCAL_PID_KEY, ORTE_PID }; + orte_gpr_keyval_t nodename = { {OBJ_CLASS(opal_object_t),0}, ORTE_NODE_NAME_KEY, ORTE_STRING }; orte_gpr_keyval_t* keyvals[2]; size_t i; orte_jobid_t jobid; diff --git a/orte/runtime/orte_wait.c b/orte/runtime/orte_wait.c index 67dda237bb..493d4dbaba 100644 --- a/orte/runtime/orte_wait.c +++ b/orte/runtime/orte_wait.c @@ -31,7 +31,7 @@ #include "runtime/orte_wait.h" #include "util/output.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "class/ompi_list.h" #include "event/event.h" #include "include/constants.h" @@ -45,7 +45,7 @@ * ********************************************************************/ struct blk_waitpid_data_t { - ompi_object_t super; + opal_object_t super; ompi_condition_t *cond; volatile int done; volatile int status; @@ -86,7 +86,7 @@ typedef struct waitpid_callback_data_t waitpid_callback_data_t; * ********************************************************************/ static void -blk_waitpid_data_construct(ompi_object_t *obj) +blk_waitpid_data_construct(opal_object_t *obj) { blk_waitpid_data_t *data = (blk_waitpid_data_t*) obj; @@ -98,7 +98,7 @@ blk_waitpid_data_construct(ompi_object_t *obj) static void -blk_waitpid_data_destruct(ompi_object_t *obj) +blk_waitpid_data_destruct(opal_object_t *obj) { blk_waitpid_data_t *data = (blk_waitpid_data_t*) obj; @@ -106,7 +106,7 @@ blk_waitpid_data_destruct(ompi_object_t *obj) } -static OBJ_CLASS_INSTANCE(blk_waitpid_data_t, ompi_object_t, +static OBJ_CLASS_INSTANCE(blk_waitpid_data_t, opal_object_t, blk_waitpid_data_construct, blk_waitpid_data_destruct); diff --git a/orte/runtime/runtime_internal.h b/orte/runtime/runtime_internal.h index 4e62ec7784..422a5c88bd 100644 --- a/orte/runtime/runtime_internal.h +++ b/orte/runtime/runtime_internal.h @@ -24,6 +24,6 @@ #include "ompi_config.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #endif diff --git a/test/Unit-Test-Status.xls b/test/Unit-Test-Status.xls index 47e4a1b2d3b382df164de98628c9da5500e80ab4..0abc25b891e2482261e65a8516350ccbb64193e1 100644 GIT binary patch delta 18 ZcmZp;z}Rqsal=i1=7PkW&3E`!A^=Q|2bBN- delta 18 ZcmZp;z}Rqsal=i1=G=nJ&3E`!A^=Ry2c7@` diff --git a/test/class/ompi_hash_table.c b/test/class/ompi_hash_table.c index 8ef14d93c3..eb3e904677 100644 --- a/test/class/ompi_hash_table.c +++ b/test/class/ompi_hash_table.c @@ -20,7 +20,7 @@ #endif #include #include "support.h" -#include "class/ompi_object.h" +#include "opal/class/opal_object.h" #include "class/ompi_hash_table.h" static FILE *error_out=NULL; diff --git a/test/mca/gpr/gpr_threads.c b/test/mca/gpr/gpr_threads.c index 63a6b00570..747587d3db 100644 --- a/test/mca/gpr/gpr_threads.c +++ b/test/mca/gpr/gpr_threads.c @@ -45,7 +45,7 @@ static FILE *test_out=NULL; /* function for exercising the registry */ -void *thread_fn(ompi_object_t *object); +void *thread_fn(opal_object_t *object); #if !OMPI_HAVE_THREAD_SUPPORT @@ -138,7 +138,7 @@ int main(int argc, char **argv) return(0); } -void *thread_fn(ompi_object_t *obj) +void *thread_fn(opal_object_t *obj) { return NULL; } diff --git a/test/threads/ompi_condition.c b/test/threads/ompi_condition.c index 47ff25abb9..fddd832fb4 100644 --- a/test/threads/ompi_condition.c +++ b/test/threads/ompi_condition.c @@ -34,7 +34,7 @@ static volatile int thr2_count = 0; #define TEST_COUNT 1000000 -static void* thr1_run(ompi_object_t* obj) +static void* thr1_run(opal_object_t* obj) { int i; clock_t c1, c2; @@ -51,7 +51,7 @@ static void* thr1_run(ompi_object_t* obj) return NULL; } -static void* thr2_run(ompi_object_t* obj) +static void* thr2_run(opal_object_t* obj) { int i; clock_t c1, c2; diff --git a/test/threads/ompi_thread.c b/test/threads/ompi_thread.c index b1dc6fbfcd..024aad248c 100644 --- a/test/threads/ompi_thread.c +++ b/test/threads/ompi_thread.c @@ -23,13 +23,13 @@ int main(int argc, char *argv[]) static volatile int count = 0; -static void* thr1_run(ompi_object_t* obj) +static void* thr1_run(opal_object_t* obj) { ompi_atomic_add(&count, 1); return NULL; } -static void* thr2_run(ompi_object_t* obj) +static void* thr2_run(opal_object_t* obj) { ompi_atomic_add(&count, 2); return NULL; diff --git a/vcproj/ompi/ompi.vcproj b/vcproj/ompi/ompi.vcproj index 461441d0dd..ff01c28750 100755 --- a/vcproj/ompi/ompi.vcproj +++ b/vcproj/ompi/ompi.vcproj @@ -179,10 +179,10 @@ RelativePath="..\..\src\class\ompi_list.h"> + RelativePath="..\..\src\class\opal_object.c"> + RelativePath="..\..\src\class\opal_object.h">