diff --git a/src/mca/allocator/allocator.h b/src/mca/allocator/allocator.h index fc131fb23c..a618acdc33 100644 --- a/src/mca/allocator/allocator.h +++ b/src/mca/allocator/allocator.h @@ -69,5 +69,14 @@ struct mca_allocator_base_module_1_0_0_t { }; typedef struct mca_allocator_base_module_1_0_0_t mca_allocator_base_module_t; +/* + * Macro for use in modules that are of type ptl v1.0.0 + */ +#define MCA_ALLOCATOR_BASE_VERSION_1_0_0 \ + /* mpool v1.0 is chained to MCA v1.0 */ \ + MCA_BASE_VERSION_1_0_0, \ + /* ptl v1.0 */ \ + "allocator", 1, 0, 0 + #endif /* MCA_ALLOCATOR_H */ diff --git a/src/mca/allocator/base/Makefile.am b/src/mca/allocator/base/Makefile.am index a2a24e0465..b4a5e36d48 100644 --- a/src/mca/allocator/base/Makefile.am +++ b/src/mca/allocator/base/Makefile.am @@ -19,7 +19,7 @@ libmca_allocator_base_la_SOURCES = \ $(headers) \ allocator_base_open.c \ allocator_base_close.c \ - allocator_base_select.c + allocator_base_init.c # Conditionally install the header files diff --git a/src/mca/allocator/base/allocator_base_select.c b/src/mca/allocator/base/allocator_base_init.c similarity index 98% rename from src/mca/allocator/base/allocator_base_select.c rename to src/mca/allocator/base/allocator_base_init.c index daae13417d..7e43b92792 100644 --- a/src/mca/allocator/base/allocator_base_select.c +++ b/src/mca/allocator/base/allocator_base_init.c @@ -17,7 +17,7 @@ * will be closed and unloaded. The selected modules will be returned * to the caller in a ompi_list_t. */ -int mca_allocator_base_select(bool *allow_multi_user_threads) +int mca_allocator_base_init(bool *allow_multi_user_threads) { #if 0 int i, num_allocators; diff --git a/src/mca/allocator/base/base.h b/src/mca/allocator/base/base.h index cc196f17a4..f2fcea5842 100644 --- a/src/mca/allocator/base/base.h +++ b/src/mca/allocator/base/base.h @@ -30,8 +30,9 @@ typedef struct mca_allocator_base_selected_module_t mca_allocator_base_selected_ extern "C" { #endif int mca_allocator_base_open(void); - int mca_allocator_base_select(bool *allow_multi_user_threads); + int mca_allocator_base_init(bool *allow_multi_user_threads); int mca_allocator_base_close(void); + mca_allocator_t* mca_allocator_lookup(const char* name); #if defined(c_plusplus) || defined(__cplusplus) } #endif