Skip to content

MCA/ATOMIC: atomic_init renamed to atomic_startup #5473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ struct mca_atomic_base_component_1_0_0_t {
mca_base_component_data_t atomic_data;

/** Component initialization function */
mca_atomic_base_component_init_fn_t atomic_init;
mca_atomic_base_component_init_fn_t atomic_startup;
mca_atomic_base_component_finalize_fn_t atomic_finalize;
mca_atomic_base_component_query_fn_t atomic_query;

Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/base/atomic_base_available.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ static int init_query(const mca_base_component_t * component,
mca_atomic_base_component_t *atomic =
(mca_atomic_base_component_t *) component;

ret = atomic->atomic_init(enable_progress_threads, enable_threads);
ret = atomic->atomic_startup(enable_progress_threads, enable_threads);
} else {
/* Unrecognized coll API version */

Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/basic/atomic_basic.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ OSHMEM_DECLSPEC void atomic_basic_unlock(shmem_ctx_t ctx, int pe);

/* API functions */

int mca_atomic_basic_init(bool enable_progress_threads, bool enable_threads);
int mca_atomic_basic_startup(bool enable_progress_threads, bool enable_threads);
int mca_atomic_basic_finalize(void);
mca_atomic_base_module_t*
mca_atomic_basic_query(int *priority);
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/basic/atomic_basic_component.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ mca_atomic_base_component_t mca_atomic_basic_component = {

/* Initialization / querying functions */

.atomic_init = mca_atomic_basic_init,
.atomic_startup = mca_atomic_basic_startup,
.atomic_finalize = mca_atomic_basic_finalize,
.atomic_query = mca_atomic_basic_query,
};
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/basic/atomic_basic_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ enum {
* Initial query function that is invoked during initialization, allowing
* this module to indicate what level of thread support it provides.
*/
int mca_atomic_basic_init(bool enable_progress_threads, bool enable_threads)
int mca_atomic_basic_startup(bool enable_progress_threads, bool enable_threads)
{
int rc = OSHMEM_SUCCESS;
void* ptr = NULL;
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/mxm/atomic_mxm.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ OSHMEM_DECLSPEC void atomic_mxm_unlock(int pe);

/* API functions */

int mca_atomic_mxm_init(bool enable_progress_threads, bool enable_threads);
int mca_atomic_mxm_startup(bool enable_progress_threads, bool enable_threads);
int mca_atomic_mxm_finalize(void);
mca_atomic_base_module_t*
mca_atomic_mxm_query(int *priority);
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/mxm/atomic_mxm_component.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ mca_atomic_base_component_t mca_atomic_mxm_component = {

/* Initialization / querying functions */

.atomic_init = mca_atomic_mxm_init,
.atomic_startup = mca_atomic_mxm_startup,
.atomic_finalize = mca_atomic_mxm_finalize,
.atomic_query = mca_atomic_mxm_query,
};
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/mxm/atomic_mxm_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* Initial query function that is invoked during initialization, allowing
* this module to indicate what level of thread support it provides.
*/
int mca_atomic_mxm_init(bool enable_progress_threads, bool enable_threads)
int mca_atomic_mxm_startup(bool enable_progress_threads, bool enable_threads)
{
return OSHMEM_SUCCESS;
}
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/ucx/atomic_ucx.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ OSHMEM_DECLSPEC void atomic_ucx_unlock(int pe);

/* API functions */

int mca_atomic_ucx_init(bool enable_progress_threads, bool enable_threads);
int mca_atomic_ucx_startup(bool enable_progress_threads, bool enable_threads);
int mca_atomic_ucx_finalize(void);
mca_atomic_base_module_t*
mca_atomic_ucx_query(int *priority);
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/ucx/atomic_ucx_component.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ mca_atomic_base_component_t mca_atomic_ucx_component = {

/* Initialization / querying functions */

mca_atomic_ucx_init,
mca_atomic_ucx_startup,
mca_atomic_ucx_finalize,
mca_atomic_ucx_query
};
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/atomic/ucx/atomic_ucx_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* Initial query function that is invoked during initialization, allowing
* this module to indicate what level of thread support it provides.
*/
int mca_atomic_ucx_init(bool enable_progress_threads, bool enable_threads)
int mca_atomic_ucx_startup(bool enable_progress_threads, bool enable_threads)
{
return OSHMEM_SUCCESS;
}
Expand Down