diff --git a/ompi/mca/bcol/basesmuma/bcol_basesmuma_component.c b/ompi/mca/bcol/basesmuma/bcol_basesmuma_component.c index 4163e94777..1ee19b2fdb 100644 --- a/ompi/mca/bcol/basesmuma/bcol_basesmuma_component.c +++ b/ompi/mca/bcol/basesmuma/bcol_basesmuma_component.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. - * Copyright (c) 2014 Los Alamos National Security, LLC. All rights + * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -76,33 +76,29 @@ mca_bcol_basesmuma_component_t mca_bcol_basesmuma_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .bcol_version = { MCA_BCOL_BASE_VERSION_2_0_0, /* Component name and version */ - "basesmuma", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "basesmuma", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - basesmuma_open, - basesmuma_close, - NULL, - basesmuma_register + .mca_open_component = basesmuma_open, + .mca_close_component = basesmuma_close, + .mca_register_component_params = basesmuma_register, }, /* Initialization / querying functions */ - mca_bcol_basesmuma_init_query, - mca_bcol_basesmuma_comm_query, - NULL, - NULL, - false, - false, - 0, /* (default) priority */ + .collm_init_query = mca_bcol_basesmuma_init_query, + .collm_comm_query = mca_bcol_basesmuma_comm_query, + .init_done = false, + .need_ordering = false, + .priority = 0, /* (default) priority */ }, }; diff --git a/ompi/mca/bcol/iboffload/bcol_iboffload_component.c b/ompi/mca/bcol/iboffload/bcol_iboffload_component.c index 253bef748b..dbf3f6c21f 100644 --- a/ompi/mca/bcol/iboffload/bcol_iboffload_component.c +++ b/ompi/mca/bcol/iboffload/bcol_iboffload_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. @@ -7,6 +8,8 @@ * reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -94,25 +97,23 @@ mca_bcol_iboffload_component_t mca_bcol_iboffload_component = { /* Component name and version */ - "iboffload", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "iboffload", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - iboffload_open, - iboffload_close, - NULL, /* query */ - mca_bcol_iboffload_register_params, + .mca_open_component = iboffload_open, + .mca_close_component = iboffload_close, + .mca_register_component_params = mca_bcol_iboffload_register_params, }, - mca_bcol_iboffload_init_query, - mca_bcol_iboffload_comm_query, - mca_bcol_iboffload_coll_supported, - mca_bcol_iboffload_coll_support_all_types, - false, - true, /* collective calls with iboffload should to be ordered */ + .collm_init_query = mca_bcol_iboffload_init_query, + .collm_comm_query = mca_bcol_iboffload_comm_query, + .coll_support = mca_bcol_iboffload_coll_supported, + .coll_support_all_types = mca_bcol_iboffload_coll_support_all_types, + .init_done = false, + .need_ordering = true, /* collective calls with iboffload should to be ordered */ }, /* iboffload-component specifc information */ .verbose = 0, /* verbose */ diff --git a/ompi/mca/bcol/ptpcoll/bcol_ptpcoll_component.c b/ompi/mca/bcol/ptpcoll/bcol_ptpcoll_component.c index 4a7a0ec8ea..c8c238c280 100644 --- a/ompi/mca/bcol/ptpcoll/bcol_ptpcoll_component.c +++ b/ompi/mca/bcol/ptpcoll/bcol_ptpcoll_component.c @@ -58,31 +58,28 @@ mca_bcol_ptpcoll_component_t mca_bcol_ptpcoll_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .bcol_version = { MCA_BCOL_BASE_VERSION_2_0_0, /* Component name and version */ - "ptpcoll", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "ptpcoll", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - ptpcoll_open, - ptpcoll_close, - .mca_register_component_params = mca_bcol_ptpcoll_register_mca_params + .mca_open_component = ptpcoll_open, + .mca_close_component = ptpcoll_close, + .mca_register_component_params = mca_bcol_ptpcoll_register_mca_params, }, /* Initialization / querying functions */ - mca_bcol_ptpcoll_init_query, - mca_bcol_ptpcoll_comm_query, - NULL, - NULL, - false, - false, + .collm_init_query = mca_bcol_ptpcoll_init_query, + .collm_comm_query = mca_bcol_ptpcoll_comm_query, + .init_done = false, + .need_ordering = false, }, /* component specific */ diff --git a/ompi/mca/bml/r2/bml_r2_component.c b/ompi/mca/bml/r2/bml_r2_component.c index 623550aa87..e5cc4b7b06 100644 --- a/ompi/mca/bml/r2/bml_r2_component.c +++ b/ompi/mca/bml/r2/bml_r2_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,23 +34,21 @@ mca_bml_base_component_2_0_0_t mca_bml_r2_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .bml_version = { MCA_BML_BASE_VERSION_2_0_0, - "r2", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_bml_r2_component_open, /* component open */ - mca_bml_r2_component_close, /* component close */ - NULL, - mca_bml_r2_component_register + .mca_component_name = "r2", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = mca_bml_r2_component_open, + .mca_close_component = mca_bml_r2_component_close, + .mca_register_component_params = mca_bml_r2_component_register, }, - { + .bml_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_bml_r2_component_init + .bml_init = mca_bml_r2_component_init, }; static int mca_bml_r2_component_register(void) diff --git a/ompi/mca/coll/basic/coll_basic_component.c b/ompi/mca/coll/basic/coll_basic_component.c index 7af7edf96d..0057b72434 100644 --- a/ompi/mca/coll/basic/coll_basic_component.c +++ b/ompi/mca/coll/basic/coll_basic_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -57,30 +60,26 @@ const mca_coll_base_component_2_0_0_t mca_coll_basic_component = { /* First, the mca_component_t struct containing meta information * about the component itself */ - { - MCA_COLL_BASE_VERSION_2_0_0, + .collm_version = { + MCA_COLL_BASE_VERSION_2_0_0, - /* Component name and version */ - "basic", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + /* Component name and version */ + .mca_component_name = "basic", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), - /* Component open and close functions */ - NULL, - NULL, - NULL, - basic_register + /* Component open and close functions */ + .mca_register_component_params = basic_register, }, - { + .collm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ - mca_coll_basic_init_query, - mca_coll_basic_comm_query + .collm_init_query = mca_coll_basic_init_query, + .collm_comm_query = mca_coll_basic_comm_query, }; diff --git a/ompi/mca/coll/cuda/coll_cuda_component.c b/ompi/mca/coll/cuda/coll_cuda_component.c index 866b0599fd..76c9b578dd 100644 --- a/ompi/mca/coll/cuda/coll_cuda_component.c +++ b/ompi/mca/coll/cuda/coll_cuda_component.c @@ -1,8 +1,11 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2014-2015 NVIDIA Corporation. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -39,30 +42,26 @@ mca_coll_cuda_component_t mca_coll_cuda_component = { /* First, the mca_component_t struct containing meta information * about the component itself */ - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "cuda", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "cuda", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - NULL, - NULL, - NULL, - cuda_register + .mca_register_component_params = cuda_register, }, - { + .collm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ - mca_coll_cuda_init_query, - mca_coll_cuda_comm_query + .collm_init_query = mca_coll_cuda_init_query, + .collm_comm_query = mca_coll_cuda_comm_query, }, /* cuda-specific component information */ diff --git a/ompi/mca/coll/demo/coll_demo_component.c b/ompi/mca/coll/demo/coll_demo_component.c index 7dbde395cb..471b5350de 100644 --- a/ompi/mca/coll/demo/coll_demo_component.c +++ b/ompi/mca/coll/demo/coll_demo_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -57,30 +60,26 @@ const mca_coll_base_component_2_0_0_t mca_coll_demo_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "demo", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "demo", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - NULL, - NULL, - NULL, - demo_register + .mca_register_component_params = demo_register, }, - { + .collm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - + /* Initialization / querying functions */ - - mca_coll_demo_init_query, - mca_coll_demo_comm_query + + .collm_init_query = mca_coll_demo_init_query, + .collm_comm_query = mca_coll_demo_comm_query, }; diff --git a/ompi/mca/coll/fca/coll_fca_component.c b/ompi/mca/coll/fca/coll_fca_component.c index 5ae1109525..65a3b2fe18 100644 --- a/ompi/mca/coll/fca/coll_fca_component.c +++ b/ompi/mca/coll/fca/coll_fca_component.c @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Mellanox Technologies. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -1056,30 +1059,28 @@ mca_coll_fca_component_t mca_coll_fca_component = { /* First, the mca_component_t struct containing meta information about the component itfca */ { - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "fca", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "fca", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - fca_open, - fca_close, - NULL, - fca_register + .mca_open_component = fca_open, + .mca_close_component = fca_close, + .mca_register_component_params = fca_register, }, - { + .collm_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, /* Initialization / querying functions */ - mca_coll_fca_init_query, - mca_coll_fca_comm_query, + .collm_init_query = mca_coll_fca_init_query, + .collm_comm_query = mca_coll_fca_comm_query, } }; diff --git a/ompi/mca/coll/hcoll/coll_hcoll_component.c b/ompi/mca/coll/hcoll/coll_hcoll_component.c index a26423a4b3..eee67d0b59 100644 --- a/ompi/mca/coll/hcoll/coll_hcoll_component.c +++ b/ompi/mca/coll/hcoll/coll_hcoll_component.c @@ -1,10 +1,13 @@ -/** - Copyright (c) 2011 Mellanox Technologies. All rights reserved. - $COPYRIGHT$ - - Additional copyrights may follow - - $HEADER$ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2011 Mellanox Technologies. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ */ #include "ompi_config.h" #include @@ -31,30 +34,28 @@ mca_coll_hcoll_component_t mca_coll_hcoll_component = { /* First, the mca_component_t struct containing meta information about the component itfca */ { - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "hcoll", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "hcoll", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - hcoll_open, - hcoll_close, - NULL, - hcoll_register + .mca_open_component = hcoll_open, + .mca_close_component = hcoll_close, + .mca_register_component_params = hcoll_register, }, - { + .collm_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, /* Initialization / querying functions */ - mca_coll_hcoll_init_query, - mca_coll_hcoll_comm_query, + .collm_init_query = mca_coll_hcoll_init_query, + .collm_comm_query = mca_coll_hcoll_comm_query, }, 90, /* priority */ 0, /* verbose level */ diff --git a/ompi/mca/coll/inter/coll_inter_component.c b/ompi/mca/coll/inter/coll_inter_component.c index 0ed3c8a872..18467ec545 100644 --- a/ompi/mca/coll/inter/coll_inter_component.c +++ b/ompi/mca/coll/inter/coll_inter_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2006-2007 University of Houston. All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -55,32 +58,28 @@ static int inter_register(void); const mca_coll_base_component_2_0_0_t mca_coll_inter_component = { - /* First, the mca_component_t struct containing meta information - about the component itself */ + /* First, the mca_component_t struct containing meta information + about the component itself */ - { - MCA_COLL_BASE_VERSION_2_0_0, + .collm_version = { + MCA_COLL_BASE_VERSION_2_0_0, - /* Component name and version */ - "inter", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + /* Component name and version */ + .mca_component_name = "inter", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), - /* Component open and close functions */ - NULL, - NULL, - NULL, - inter_register - }, - { - /* This component is checkpointable */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, + /* Component open and close functions */ + .mca_register_component_params = inter_register, + }, + .collm_data = { + /* This component is checkpointable */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, - /* Initialization / querying functions */ - mca_coll_inter_init_query, - mca_coll_inter_comm_query + /* Initialization / querying functions */ + .collm_init_query = mca_coll_inter_init_query, + .collm_comm_query = mca_coll_inter_comm_query, }; diff --git a/ompi/mca/coll/libnbc/coll_libnbc_component.c b/ompi/mca/coll/libnbc/coll_libnbc_component.c index 4ef8a6126a..22d4f5f718 100644 --- a/ompi/mca/coll/libnbc/coll_libnbc_component.c +++ b/ompi/mca/coll/libnbc/coll_libnbc_component.c @@ -55,29 +55,27 @@ ompi_coll_libnbc_component_t mca_coll_libnbc_component = { { /* First, the mca_component_t struct containing meta information * about the component itself */ - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "libnbc", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "libnbc", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - libnbc_open, - libnbc_close, - NULL, - libnbc_register + .mca_open_component = libnbc_open, + .mca_close_component = libnbc_close, + .mca_register_component_params = libnbc_register, }, - { + .collm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ - libnbc_init_query, - libnbc_comm_query + .collm_init_query = libnbc_init_query, + .collm_comm_query = libnbc_comm_query, } }; diff --git a/ompi/mca/coll/ml/coll_ml_component.c b/ompi/mca/coll/ml/coll_ml_component.c index e09abe6422..4b4cf277c1 100644 --- a/ompi/mca/coll/ml/coll_ml_component.c +++ b/ompi/mca/coll/ml/coll_ml_component.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. - * Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights @@ -75,9 +75,8 @@ mca_coll_ml_component_t mca_coll_ml_component = { /* Component name and version */ .mca_component_name = "ml", - .mca_component_major_version = OMPI_MAJOR_VERSION, - .mca_component_minor_version = OMPI_MINOR_VERSION, - .mca_component_release_version = OMPI_RELEASE_VERSION, + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open, close, and register functions */ diff --git a/ompi/mca/coll/portals4/coll_portals4_component.c b/ompi/mca/coll/portals4/coll_portals4_component.c index a5814c67ec..1f42eb349c 100644 --- a/ompi/mca/coll/portals4/coll_portals4_component.c +++ b/ompi/mca/coll/portals4/coll_portals4_component.c @@ -53,29 +53,27 @@ mca_coll_portals4_component_t mca_coll_portals4_component = { /* First, the mca_component_t struct containing meta information * about the component itself */ - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "portals4", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "portals4", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - portals4_open, - portals4_close, - NULL, - portals4_register + .mca_open_component = portals4_open, + .mca_close_component = portals4_close, + .mca_register_component_params = portals4_register }, - { + .collm_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, /* Initialization / querying functions */ - portals4_init_query, - portals4_comm_query + .collm_init_query = portals4_init_query, + .collm_comm_query = portals4_comm_query, }, }; diff --git a/ompi/mca/coll/self/coll_self_component.c b/ompi/mca/coll/self/coll_self_component.c index 8fc050ef8b..8a7a4b89b9 100644 --- a/ompi/mca/coll/self/coll_self_component.c +++ b/ompi/mca/coll/self/coll_self_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -57,30 +60,26 @@ const mca_coll_base_component_2_0_0_t mca_coll_self_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "self", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "self", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - NULL, - NULL, - NULL, - self_register + .mca_register_component_params = self_register, }, - { + .collm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ - mca_coll_self_init_query, - mca_coll_self_comm_query + .collm_init_query = mca_coll_self_init_query, + .collm_comm_query = mca_coll_self_comm_query, }; static int self_register(void) diff --git a/ompi/mca/coll/sm/coll_sm_component.c b/ompi/mca/coll/sm/coll_sm_component.c index 816ba9fdaa..bdb7b568bb 100644 --- a/ompi/mca/coll/sm/coll_sm_component.c +++ b/ompi/mca/coll/sm/coll_sm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011 Los Alamos National Security, LLC. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. * All rights reserved. * $COPYRIGHT$ * @@ -61,30 +62,27 @@ mca_coll_sm_component_t mca_coll_sm_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "sm", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "sm", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component functions */ - NULL, /* open */ - sm_close, - NULL, /* query */ - sm_register + .mca_close_component = sm_close, + .mca_query_component = sm_register, }, - { + .collm_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, /* Initialization / querying functions */ - - mca_coll_sm_init_query, - mca_coll_sm_comm_query, + + .collm_init_query = mca_coll_sm_init_query, + .collm_comm_query = mca_coll_sm_comm_query, }, /* sm-component specifc information */ diff --git a/ompi/mca/coll/tuned/coll_tuned_component.c b/ompi/mca/coll/tuned/coll_tuned_component.c index ac3fe4426b..010d86364e 100644 --- a/ompi/mca/coll/tuned/coll_tuned_component.c +++ b/ompi/mca/coll/tuned/coll_tuned_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -75,30 +78,28 @@ mca_coll_tuned_component_t mca_coll_tuned_component = { { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .collm_version = { MCA_COLL_BASE_VERSION_2_0_0, /* Component name and version */ - "tuned", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "tuned", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - tuned_open, - tuned_close, - NULL, - tuned_register + .mca_open_component = tuned_open, + .mca_close_component = tuned_close, + .mca_register_component_params = tuned_register, }, - { + .collm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ - ompi_coll_tuned_init_query, - ompi_coll_tuned_comm_query, + .collm_init_query = ompi_coll_tuned_init_query, + .collm_comm_query = ompi_coll_tuned_comm_query, }, /* priority of the module */ diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_component.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_component.c index 2c75858ad9..a3a619d820 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_component.c +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. @@ -7,6 +8,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -47,31 +50,27 @@ ompi_crcp_bkmrk_component_t mca_crcp_bkmrk_component = { /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { OMPI_CRCP_BASE_VERSION_2_0_0, /* Component name and version */ - "bkmrk", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - + .mca_component_name = "bkmrk", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + /* Component open and close functions */ - crcp_bkmrk_open, - crcp_bkmrk_close, - ompi_crcp_bkmrk_component_query, - crcp_bkmrk_register + .mca_open_component = crcp_bkmrk_open, + .mca_close_component = crcp_bkmrk_close, + .mca_query_component = ompi_crcp_bkmrk_component_query, + .mca_register_component_params = crcp_bkmrk_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - /* Verbosity level */ - 0, - /* opal_output handler */ - -1, - /* Default priority */ - 20 + .verbose = 0, + .output_handle = -1, + .priority = 20, } }; diff --git a/ompi/mca/dpm/orte/dpm_orte_component.c b/ompi/mca/dpm/orte/dpm_orte_component.c index 0d9a1888ac..184742c4a1 100644 --- a/ompi/mca/dpm/orte/dpm_orte_component.c +++ b/ompi/mca/dpm/orte/dpm_orte_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,21 +32,20 @@ ompi_dpm_base_component_t mca_dpm_orte_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - OMPI_DPM_BASE_VERSION_2_0_0, + .base_version = { + OMPI_DPM_BASE_VERSION_2_0_0, - "orte", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - dpm_orte_component_open, /* component open */ - dpm_orte_component_close, /* component close */ - dpm_orte_component_query /* component query */ + .mca_component_name = "orte", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = dpm_orte_component_open, + .mca_close_component = dpm_orte_component_close, + .mca_query_component = dpm_orte_component_query, }, - { + .base_data = { /* This component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/ompi/mca/fbtl/plfs/fbtl_plfs_component.c b/ompi/mca/fbtl/plfs/fbtl_plfs_component.c index ad97288c90..985b29db58 100644 --- a/ompi/mca/fbtl/plfs/fbtl_plfs_component.c +++ b/ompi/mca/fbtl/plfs/fbtl_plfs_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2014 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -44,22 +47,19 @@ mca_fbtl_base_component_2_0_0_t mca_fbtl_plfs_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .fbtlm_version = { MCA_FBTL_BASE_VERSION_2_0_0, /* Component name and version */ - "plfs", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - NULL, - NULL + .mca_component_name = "plfs", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), }, - { + .fbtlm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fbtl_plfs_component_init_query, /* get thread level */ - mca_fbtl_plfs_component_file_query, /* get priority and actions */ - mca_fbtl_plfs_component_file_unquery /* undo what was done by previous function */ + .fbtlm_init_query = mca_fbtl_plfs_component_init_query, /* get thread level */ + .fbtlm_file_query = mca_fbtl_plfs_component_file_query, /* get priority and actions */ + .fbtlm_file_unquery = mca_fbtl_plfs_component_file_unquery, /* undo what was done by previous function */ }; diff --git a/ompi/mca/fbtl/posix/fbtl_posix_component.c b/ompi/mca/fbtl/posix/fbtl_posix_component.c index aeb4d93289..7dfb5d6eb3 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix_component.c +++ b/ompi/mca/fbtl/posix/fbtl_posix_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2011 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -44,22 +47,19 @@ mca_fbtl_base_component_2_0_0_t mca_fbtl_posix_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .fbtlm_version = { MCA_FBTL_BASE_VERSION_2_0_0, /* Component name and version */ - "posix", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - NULL, - NULL + .mca_component_name = "posix", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), }, - { + .fbtlm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fbtl_posix_component_init_query, /* get thread level */ - mca_fbtl_posix_component_file_query, /* get priority and actions */ - mca_fbtl_posix_component_file_unquery /* undo what was done by previous function */ + .fbtlm_init_query = mca_fbtl_posix_component_init_query, /* get thread level */ + .fbtlm_file_query = mca_fbtl_posix_component_file_query, /* get priority and actions */ + .fbtlm_file_unquery = mca_fbtl_posix_component_file_unquery, /* undo what was done by previous function */ }; diff --git a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_component.c b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_component.c index 9ae5cd22e5..34ac9ce4dd 100644 --- a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_component.c +++ b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2011 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -44,22 +47,19 @@ mca_fbtl_base_component_2_0_0_t mca_fbtl_pvfs2_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .fbtlm_version = { MCA_FBTL_BASE_VERSION_2_0_0, /* Component name and version */ - "pvfs2", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - NULL, - NULL + .mca_component_name = "pvfs2", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), }, - { + .fbtlm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fbtl_pvfs2_component_init_query, /* get thread level */ - mca_fbtl_pvfs2_component_file_query, /* get priority and actions */ - mca_fbtl_pvfs2_component_file_unquery /* undo what was done by previous function */ + .fbtlm_init_query = mca_fbtl_pvfs2_component_init_query, /* get thread level */ + .fbtlm_file_query = mca_fbtl_pvfs2_component_file_query, /* get priority and actions */ + .fbtlm_file_unquery = mca_fbtl_pvfs2_component_file_unquery, /* undo what was done by previous function */ }; diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic_component.c b/ompi/mca/fcoll/dynamic/fcoll_dynamic_component.c index dee300a966..6fd25d175f 100644 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic_component.c +++ b/ompi/mca/fcoll/dynamic/fcoll_dynamic_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2014 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -53,24 +56,23 @@ mca_fcoll_base_component_2_0_0_t mca_fcoll_dynamic_component = { /* First, the mca_component_t struct containing meta information * about the component itself */ - { - MCA_FCOLL_BASE_VERSION_2_0_0, + .fcollm_version = { + MCA_FCOLL_BASE_VERSION_2_0_0, - /* Component name and version */ - "dynamic", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - .mca_register_component_params = dynamic_register, + /* Component name and version */ + .mca_component_name = "dynamic", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_register_component_params = dynamic_register, }, - { + .fcollm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fcoll_dynamic_component_init_query, - mca_fcoll_dynamic_component_file_query, - mca_fcoll_dynamic_component_file_unquery + .fcollm_init_query = mca_fcoll_dynamic_component_init_query, + .fcollm_file_query = mca_fcoll_dynamic_component_file_query, + .fcollm_file_unquery = mca_fcoll_dynamic_component_file_unquery, }; diff --git a/ompi/mca/fcoll/individual/fcoll_individual_component.c b/ompi/mca/fcoll/individual/fcoll_individual_component.c index 3d159d27ff..829fa10a59 100644 --- a/ompi/mca/fcoll/individual/fcoll_individual_component.c +++ b/ompi/mca/fcoll/individual/fcoll_individual_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2014 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -56,24 +59,23 @@ mca_fcoll_base_component_2_0_0_t mca_fcoll_individual_component = { /* First, the mca_component_t struct containing meta information * about the component itself */ - { - MCA_FCOLL_BASE_VERSION_2_0_0, + .fcollm_version = { + MCA_FCOLL_BASE_VERSION_2_0_0, - /* Component name and version */ - "individual", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - .mca_register_component_params = individual_register, + /* Component name and version */ + .mca_component_name = "individual", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_register_component_params = individual_register, }, - { + .fcollm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fcoll_individual_component_init_query, - mca_fcoll_individual_component_file_query, - mca_fcoll_individual_component_file_unquery + .fcollm_init_query = mca_fcoll_individual_component_init_query, + .fcollm_file_query = mca_fcoll_individual_component_file_query, + .fcollm_file_unquery = mca_fcoll_individual_component_file_unquery, }; diff --git a/ompi/mca/fcoll/static/fcoll_static_component.c b/ompi/mca/fcoll/static/fcoll_static_component.c index b6f41b0df3..32e600d2b7 100644 --- a/ompi/mca/fcoll/static/fcoll_static_component.c +++ b/ompi/mca/fcoll/static/fcoll_static_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2014 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -56,24 +59,23 @@ mca_fcoll_base_component_2_0_0_t mca_fcoll_static_component = { /* First, the mca_component_t struct containing meta information * about the component itself */ - { - MCA_FCOLL_BASE_VERSION_2_0_0, + .fcollm_version = { + MCA_FCOLL_BASE_VERSION_2_0_0, - /* Component name and version */ - "static", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - .mca_register_component_params = static_register, + /* Component name and version */ + .mca_component_name = "static", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_register_component_params = static_register, }, - { + .fcollm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fcoll_static_component_init_query, - mca_fcoll_static_component_file_query, - mca_fcoll_static_component_file_unquery + .fcollm_init_query = mca_fcoll_static_component_init_query, + .fcollm_file_query = mca_fcoll_static_component_file_query, + .fcollm_file_unquery = mca_fcoll_static_component_file_unquery, }; diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_component.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_component.c index b0390a601a..3a2a2aa127 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_component.c +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2014 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -56,24 +59,23 @@ mca_fcoll_base_component_2_0_0_t mca_fcoll_two_phase_component = { /* First, the mca_component_t struct containing meta information * about the component itself */ - { - MCA_FCOLL_BASE_VERSION_2_0_0, + .fcollm_version = { + MCA_FCOLL_BASE_VERSION_2_0_0, - /* Component name and version */ - "two_phase", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - .mca_register_component_params = two_phase_register, + /* Component name and version */ + .mca_component_name = "two_phase", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_register_component_params = two_phase_register, }, - { + .fcollm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fcoll_two_phase_component_init_query, - mca_fcoll_two_phase_component_file_query, - mca_fcoll_two_phase_component_file_unquery + .fcollm_init_query = mca_fcoll_two_phase_component_init_query, + .fcollm_file_query = mca_fcoll_two_phase_component_file_query, + .fcollm_file_unquery = mca_fcoll_two_phase_component_file_unquery, }; diff --git a/ompi/mca/fs/lustre/fs_lustre_component.c b/ompi/mca/fs/lustre/fs_lustre_component.c index b9c3339af0..ccf2580c8d 100644 --- a/ompi/mca/fs/lustre/fs_lustre_component.c +++ b/ompi/mca/fs/lustre/fs_lustre_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2011 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -51,23 +54,22 @@ mca_fs_base_component_2_0_0_t mca_fs_lustre_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .fsm_version = { MCA_FS_BASE_VERSION_2_0_0, /* Component name and version */ - "lustre", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "lustre", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), .mca_register_component_params = lustre_register, }, - { + .fsm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fs_lustre_component_init_query, /* get thread level */ - mca_fs_lustre_component_file_query, /* get priority and actions */ - mca_fs_lustre_component_file_unquery /* undo what was done by previous function */ + .fsm_init_query = mca_fs_lustre_component_init_query, /* get thread level */ + .fsm_file_query = mca_fs_lustre_component_file_query, /* get priority and actions */ + .fsm_file_unquery = mca_fs_lustre_component_file_unquery, /* undo what was done by previous function */ }; static int diff --git a/ompi/mca/fs/plfs/fs_plfs_component.c b/ompi/mca/fs/plfs/fs_plfs_component.c index 22dd773e23..37c5074532 100644 --- a/ompi/mca/fs/plfs/fs_plfs_component.c +++ b/ompi/mca/fs/plfs/fs_plfs_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2014 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -47,23 +50,22 @@ mca_fs_base_component_2_0_0_t mca_fs_plfs_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .fsm_version = { MCA_FS_BASE_VERSION_2_0_0, /* Component name and version */ - "plfs", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "plfs", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), .mca_register_component_params = plfs_register, }, - { + .fsm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fs_plfs_component_init_query, /* get thread level */ - mca_fs_plfs_component_file_query, /* get priority and actions */ - mca_fs_plfs_component_file_unquery /* undo what was done by previous function */ + .fsm_init_query = mca_fs_plfs_component_init_query, /* get thread level */ + .fsm_file_query = mca_fs_plfs_component_file_query, /* get priority and actions */ + .fsm_file_unquery = mca_fs_plfs_component_file_unquery, /* undo what was done by previous function */ }; static int diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2_component.c b/ompi/mca/fs/pvfs2/fs_pvfs2_component.c index 2e50010c87..9f14312b18 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2_component.c +++ b/ompi/mca/fs/pvfs2/fs_pvfs2_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2013 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -49,24 +52,23 @@ mca_fs_base_component_2_0_0_t mca_fs_pvfs2_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .fsm_version = { MCA_FS_BASE_VERSION_2_0_0, /* Component name and version */ - "pvfs2", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "pvfs2", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), .mca_register_component_params = pvfs2_register, }, - { + .fsm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fs_pvfs2_component_init_query, /* get thread level */ - mca_fs_pvfs2_component_file_query, /* get priority and actions */ - mca_fs_pvfs2_component_file_unquery /* undo what was done by previous function */ -}; + .fsm_init_query = mca_fs_pvfs2_component_init_query, /* get thread level */ + .fsm_file_query = mca_fs_pvfs2_component_file_query, /* get priority and actions */ + .fsm_file_unquery = mca_fs_pvfs2_component_file_unquery, /* undo what was done by previous function */ +};. static int pvfs2_register(void) diff --git a/ompi/mca/fs/ufs/fs_ufs_component.c b/ompi/mca/fs/ufs/fs_ufs_component.c index 93805f55df..37a9cd9310 100644 --- a/ompi/mca/fs/ufs/fs_ufs_component.c +++ b/ompi/mca/fs/ufs/fs_ufs_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2011 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -44,22 +47,19 @@ mca_fs_base_component_2_0_0_t mca_fs_ufs_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .fsm_version = { MCA_FS_BASE_VERSION_2_0_0, /* Component name and version */ - "ufs", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - NULL, - NULL + .mca_component_name = "ufs", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), }, - { + .fsm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_fs_ufs_component_init_query, /* get thread level */ - mca_fs_ufs_component_file_query, /* get priority and actions */ - mca_fs_ufs_component_file_unquery /* undo what was done by previous function */ + .fsm_init_query = mca_fs_ufs_component_init_query, /* get thread level */ + .fsm_file_query = mca_fs_ufs_component_file_query, /* get priority and actions */ + .fsm_file_unquery = mca_fs_ufs_component_file_unquery, /* undo what was done by previous function */ }; diff --git a/ompi/mca/io/ompio/io_ompio_component.c b/ompi/mca/io/ompio/io_ompio_component.c index 08ab296bbf..6da3a9bb1b 100644 --- a/ompi/mca/io/ompio/io_ompio_component.c +++ b/ompi/mca/io/ompio/io_ompio_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2014 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -96,34 +99,30 @@ mca_io_base_component_2_0_0_t mca_io_ompio_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .io_version = { MCA_IO_BASE_VERSION_2_0_0, - "ompio", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - open_component, - close_component, + .mca_component_name = "ompio", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = open_component, + .mca_close_component = close_component, .mca_register_component_params = register_component, }, - { + .io_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initial configuration / Open a new file */ - init_query, - file_query, - file_unquery, + .io_init_query = init_query, + .io_file_query = file_query, + .io_file_unquery = file_unquery, /* Delete a file */ - delete_query, - NULL, /* delete_unquery */ - delete_select, /* delete_select */ - - NULL /* io_register_datarep */ + .io_delete_query = delete_query, + .io_delete_select = delete_select, }; static int register_component(void) diff --git a/ompi/mca/io/romio/src/io_romio_component.c b/ompi/mca/io/romio/src/io_romio_component.c index f4ea7a844f..26079df9d8 100644 --- a/ompi/mca/io/romio/src/io_romio_component.c +++ b/ompi/mca/io/romio/src/io_romio_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -79,35 +82,32 @@ mca_io_base_component_2_0_0_t mca_io_romio_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .io_version = { MCA_IO_BASE_VERSION_2_0_0, - "romio", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - open_component, - close_component, - NULL, - register_component + .mca_component_name = "romio", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = open_component, + .mca_close_component = close_component, + .mca_register_component_params = register_component, }, - { + .io_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initial configuration / Open a new file */ - init_query, - file_query, - file_unquery, + .io_init_query = init_query, + .io_file_query = file_query, + .io_file_unquery = file_unquery, /* Delete a file */ - delete_query, - NULL, - delete_select, + .io_delete_query = delete_query, + .io_delete_select = delete_select, - register_datarep + .io_register_datarep = register_datarep, }; static char *ompi_io_romio_version = ROMIO_VERSION_STRING; diff --git a/ompi/mca/mtl/mxm/mtl_mxm_component.c b/ompi/mca/mtl/mxm/mtl_mxm_component.c index bec3028409..9b5e9b6617 100644 --- a/ompi/mca/mtl/mxm/mtl_mxm_component.c +++ b/ompi/mca/mtl/mxm/mtl_mxm_component.c @@ -46,22 +46,21 @@ mca_mtl_mxm_component_t mca_mtl_mxm_component = { * First, the mca_base_component_t struct containing meta * information about the component itself */ - { + .mtl_version = { MCA_MTL_BASE_VERSION_2_0_0, - "mxm", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - ompi_mtl_mxm_component_open, /* component open */ - ompi_mtl_mxm_component_close, /* component close */ - ompi_mtl_mxm_component_query, /* component query */ - ompi_mtl_mxm_component_register + .mca_component_name = "mxm", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = ompi_mtl_mxm_component_open, + .mca_close_component = ompi_mtl_mxm_component_close, + .mca_query_component = ompi_mtl_mxm_component_query, + .mca_register_component_params = ompi_mtl_mxm_component_register, }, - { + .mtl_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, - ompi_mtl_mxm_component_init /* component init */ + .mtl_init = ompi_mtl_mxm_component_init, } }; diff --git a/ompi/mca/mtl/ofi/mtl_ofi_component.c b/ompi/mca/mtl/ofi/mtl_ofi_component.c index b6cb6f6421..26eb5fcc97 100644 --- a/ompi/mca/mtl/ofi/mtl_ofi_component.c +++ b/ompi/mca/mtl/ofi/mtl_ofi_component.c @@ -39,24 +39,23 @@ mca_mtl_ofi_component_t mca_mtl_ofi_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ - { + .mtl_version = { MCA_MTL_BASE_VERSION_2_0_0, - "ofi", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - ompi_mtl_ofi_component_open, /* component open */ - ompi_mtl_ofi_component_close, /* component close */ - ompi_mtl_ofi_component_query, - ompi_mtl_ofi_component_register + .mca_component_name = "ofi", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = ompi_mtl_ofi_component_open, + .mca_close_component = ompi_mtl_ofi_component_close, + .mca_query_component = ompi_mtl_ofi_component_query, + .mca_register_component_params = ompi_mtl_ofi_component_register, }, - { + .mtl_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, - ompi_mtl_ofi_component_init, /* component init */ + .mtl_init = ompi_mtl_ofi_component_init, } }; diff --git a/ompi/mca/mtl/portals4/mtl_portals4_component.c b/ompi/mca/mtl/portals4/mtl_portals4_component.c index a615601234..3544f135ab 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4_component.c +++ b/ompi/mca/mtl/portals4/mtl_portals4_component.c @@ -49,24 +49,23 @@ mca_mtl_base_component_2_0_0_t mca_mtl_portals4_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ - { + .mtl_version = { MCA_MTL_BASE_VERSION_2_0_0, - "portals4", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - ompi_mtl_portals4_component_open, /* component open */ - ompi_mtl_portals4_component_close, /* component close */ - ompi_mtl_portals4_component_query, /* component close */ - ompi_mtl_portals4_component_register + .mca_component_name = "portals4", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = ompi_mtl_portals4_component_open, + .mca_close_component = ompi_mtl_portals4_component_close, + .mca_query_component = ompi_mtl_portals4_component_query, + .mca_register_component_params = ompi_mtl_portals4_component_register, }, - { + .mtl_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, - ompi_mtl_portals4_component_init, /* component init */ + .mtl_init = ompi_mtl_portals4_component_init, }; static mca_base_var_enum_value_t long_protocol_values[] = { diff --git a/ompi/mca/mtl/psm/mtl_psm_component.c b/ompi/mca/mtl/psm/mtl_psm_component.c index 16a2a6a957..b55d56626b 100644 --- a/ompi/mca/mtl/psm/mtl_psm_component.c +++ b/ompi/mca/mtl/psm/mtl_psm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -53,24 +54,23 @@ mca_mtl_psm_component_t mca_mtl_psm_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ - { + .mtl_version = { MCA_MTL_BASE_VERSION_2_0_0, - - "psm", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - ompi_mtl_psm_component_open, /* component open */ - ompi_mtl_psm_component_close, /* component close */ - ompi_mtl_psm_component_query, /* component close */ - ompi_mtl_psm_component_register + + .mca_component_name = "psm", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = ompi_mtl_psm_component_open, + .mca_close_component = ompi_mtl_psm_component_close, + .mca_query_component = ompi_mtl_psm_component_query, + .mca_register_component_params = ompi_mtl_psm_component_register, }, - { + .mtl_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, - - ompi_mtl_psm_component_init /* component init */ + + .mtl_init = ompi_mtl_psm_component_init, } }; diff --git a/ompi/mca/op/example/op_example_component.c b/ompi/mca/op/example/op_example_component.c index f6bd094737..750227838a 100644 --- a/ompi/mca/op/example/op_example_component.c +++ b/ompi/mca/op/example/op_example_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -45,25 +48,23 @@ ompi_op_example_component_t mca_op_example_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - { + .opc_version = { OMPI_OP_BASE_VERSION_1_0_0, - - "example", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - example_component_open, - example_component_close, - NULL, - example_component_register + + .mca_component_name = "example", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = example_component_open, + .mca_close_component = example_component_close, + .mca_register_component_params = example_component_register, }, - { + .opc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - - example_component_init_query, - example_component_op_query, + + .opc_init_query = example_component_init_query, + .opc_op_query = example_component_op_query, }, /* Now comes the example-component-specific data. In this case, diff --git a/ompi/mca/op/x86/op_x86_component.c b/ompi/mca/op/x86/op_x86_component.c index ff5c964edb..67cabee614 100644 --- a/ompi/mca/op/x86/op_x86_component.c +++ b/ompi/mca/op/x86/op_x86_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -48,25 +51,23 @@ ompi_op_x86_component_t mca_op_x86_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ { - { + .opc_version = { OMPI_OP_BASE_VERSION_1_0_0, - - "x86", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - x86_component_open, - x86_component_close, - NULL, - x86_component_register + + .mca_component_name = "x86", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = x86_component_open, + .mca_close_component = x86_component_close, + .mca_register_component_params = x86_component_register, }, - { + .opc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - - x86_component_init_query, - x86_component_op_query, + + .opc_init_query = x86_component_init_query, + .opc_op_query = x86_component_op_query, }, /* Now comes the x86-component-specific data. In this case, diff --git a/ompi/mca/osc/portals4/osc_portals4_component.c b/ompi/mca/osc/portals4/osc_portals4_component.c index dd0fca6a6f..4cb9f81c85 100644 --- a/ompi/mca/osc/portals4/osc_portals4_component.c +++ b/ompi/mca/osc/portals4/osc_portals4_component.c @@ -34,25 +34,22 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in ompi_osc_portals4_component_t mca_osc_portals4_component = { { /* ompi_osc_base_component_t */ - { /* ompi_base_component_t */ + .osc_version = { OMPI_OSC_BASE_VERSION_3_0_0, - "portals4", - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - component_open, - NULL, - NULL, - component_register + .mca_component_name = "portals4", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = component_open, + .mca_register_component_params = component_register, }, - { /* mca_base_component_data */ + .osc_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, - component_init, - component_query, - component_select, - component_finalize + .osc_init = component_init, + .osc_query = component_query, + .osc_select = component_select, + .osc_finalize = component_finalize, } }; diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c index da5f09cd6d..cc2cd95627 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c @@ -57,25 +57,22 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in ompi_osc_pt2pt_component_t mca_osc_pt2pt_component = { { /* ompi_osc_base_component_t */ - { /* ompi_base_component_t */ + .osc_version = { OMPI_OSC_BASE_VERSION_3_0_0, - "pt2pt", - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - component_open, - NULL, - NULL, - component_register + .mca_component_name = "pt2pt", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = component_open, + .mca_register_component_params = component_register, }, - { /* mca_base_component_data */ + .osc_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, - component_init, - component_query, - component_select, - component_finalize + .osc_init = component_init, + .osc_query = component_query, + .osc_select = component_select, + .osc_finalize = component_finalize, } }; diff --git a/ompi/mca/osc/sm/osc_sm_component.c b/ompi/mca/osc/sm/osc_sm_component.c index 4c473e54fb..95688a47ef 100644 --- a/ompi/mca/osc/sm/osc_sm_component.c +++ b/ompi/mca/osc/sm/osc_sm_component.c @@ -35,23 +35,21 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in ompi_osc_sm_component_t mca_osc_sm_component = { { /* ompi_osc_base_component_t */ - { /* ompi_base_component_t */ + .osc_version = { OMPI_OSC_BASE_VERSION_3_0_0, - "sm", - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - component_open, - NULL + .mca_component_name = "sm", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = component_open, }, - { /* mca_base_component_data */ + .osc_data = { /* mca_base_component_data */ /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, - component_init, - component_query, - component_select, - component_finalize + .osc_init = component_init, + .osc_query = component_query, + .osc_select = component_select, + .osc_finalize = component_finalize, } }; diff --git a/ompi/mca/pml/bfo/pml_bfo_component.c b/ompi/mca/pml/bfo/pml_bfo_component.c index fab1b8affe..274f5fb047 100644 --- a/ompi/mca/pml/bfo/pml_bfo_component.c +++ b/ompi/mca/pml/bfo/pml_bfo_component.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; c-basic-offset:4 ; -*- */ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -14,6 +14,8 @@ * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -58,26 +60,23 @@ mca_pml_base_component_2_0_0_t mca_pml_bfo_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - MCA_PML_BASE_VERSION_2_0_0, - - "bfo", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_pml_bfo_component_open, /* component open */ - mca_pml_bfo_component_close, /* component close */ - NULL, - mca_pml_bfo_component_register + .pmlm_version = { + MCA_PML_BASE_VERSION_2_0_0, + + .mca_component_name = "bfo", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = mca_pml_bfo_component_open, + .mca_close_component = mca_pml_bfo_component_close, + .mca_register_component_params = mca_pml_bfo_component_register, }, - { + .pmlm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_pml_bfo_component_init, /* component init */ - mca_pml_bfo_component_fini /* component finalize */ - + .pmlm_init = mca_pml_bfo_component_init, + .pmlm_finalize = mca_pml_bfo_component_fini, }; void *mca_pml_bfo_seg_alloc( struct mca_mpool_base_module_t* mpool, diff --git a/ompi/mca/pml/cm/pml_cm_component.c b/ompi/mca/pml/cm/pml_cm_component.c index e42398f69f..f5e932f7d0 100644 --- a/ompi/mca/pml/cm/pml_cm_component.c +++ b/ompi/mca/pml/cm/pml_cm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2006-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * All rights reserved. * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Sandia National Laboratories. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -36,29 +39,26 @@ static mca_pml_base_module_t* mca_pml_cm_component_init( int* priority, static int mca_pml_cm_component_fini(void); mca_pml_base_component_2_0_0_t mca_pml_cm_component = { - /* First, the mca_base_component_t struct containing meta * information about the component itself */ - { - MCA_PML_BASE_VERSION_2_0_0, + .pmlm_version = { + MCA_PML_BASE_VERSION_2_0_0, - "cm", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_pml_cm_component_open, /* component open */ - mca_pml_cm_component_close, /* component close */ - NULL, - mca_pml_cm_component_register, - }, - { - /* This component is not checkpoint ready */ - MCA_BASE_METADATA_PARAM_NONE - }, + .mca_component_name = "cm", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = mca_pml_cm_component_open, + .mca_close_component = mca_pml_cm_component_close, + .mca_register_component_params = mca_pml_cm_component_register, + }, + .pmlm_data = { + /* This component is not checkpoint ready */ + MCA_BASE_METADATA_PARAM_NONE + }, - mca_pml_cm_component_init, /* component init */ - mca_pml_cm_component_fini /* component finalize */ + .pmlm_init = mca_pml_cm_component_init, + .pmlm_finalize = mca_pml_cm_component_fini, }; /* Array of send completion callback - one per send type diff --git a/ompi/mca/pml/crcpw/pml_crcpw_component.c b/ompi/mca/pml/crcpw/pml_crcpw_component.c index 51d9b8ce2c..64bbfe455d 100644 --- a/ompi/mca/pml/crcpw/pml_crcpw_component.c +++ b/ompi/mca/pml/crcpw/pml_crcpw_component.c @@ -39,25 +39,23 @@ mca_pml_crcpw_component_t mca_pml_crcpw_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .pmlm_version = { MCA_PML_BASE_VERSION_2_0_0, - "crcpw", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_pml_crcpw_component_open, /* component open */ - mca_pml_crcpw_component_close, /* component close */ - NULL, - mca_pml_crcpw_component_register + .mca_component_name = "crcpw", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = mca_pml_crcpw_component_open, + .mca_close_component = mca_pml_crcpw_component_close, + .mca_register_component_params = mca_pml_crcpw_component_register, }, - { + .pmlm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_pml_crcpw_component_init, /* component init */ - mca_pml_crcpw_component_finalize /* component finalize */ + .pmlm_init = mca_pml_crcpw_component_init, + .pmlm_finalize = mca_pml_crcpw_component_finalize, }, /* Verbosity */ 0, diff --git a/ompi/mca/pml/example/pml_example_component.c b/ompi/mca/pml/example/pml_example_component.c index 30733b3609..512aed5594 100644 --- a/ompi/mca/pml/example/pml_example_component.c +++ b/ompi/mca/pml/example/pml_example_component.c @@ -6,6 +6,8 @@ * Copyright (c) 2004-2005 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,25 +34,23 @@ mca_pml_base_component_2_0_0_t mca_pml_example_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ - { - MCA_PML_BASE_VERSION_2_0_0, + .pmlm_version = { + MCA_PML_BASE_VERSION_2_0_0, - "example", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_pml_example_component_open, /* component open */ - mca_pml_example_component_close, /* component close */ - NULL, - mca_pml_example_component_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, + .mca_component_name = "example", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = mca_pml_example_component_open, + .mca_close_component = mca_pml_example_component_close, + .mca_register_component_params = mca_pml_example_component_register, + }, + .pmlm_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, - mca_pml_example_component_init, /* component init */ - mca_pml_example_component_fini /* component finalize */ + .pmlm_init = mca_pml_example_component_init, + .pmlm_finalize = mca_pml_example_component_fini, }; static int mca_pml_example_component_register(void) diff --git a/ompi/mca/pml/ob1/pml_ob1_component.c b/ompi/mca/pml/ob1/pml_ob1_component.c index 13444cd660..309c51cdf8 100644 --- a/ompi/mca/pml/ob1/pml_ob1_component.c +++ b/ompi/mca/pml/ob1/pml_ob1_component.c @@ -55,30 +55,27 @@ int mca_pml_ob1_output = 0; static int mca_pml_ob1_verbose = 0; mca_pml_base_component_2_0_0_t mca_pml_ob1_component = { - /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - MCA_PML_BASE_VERSION_2_0_0, + .pmlm_version = { + MCA_PML_BASE_VERSION_2_0_0, - "ob1", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_pml_ob1_component_open, /* component open */ - mca_pml_ob1_component_close, /* component close */ - NULL, - mca_pml_ob1_component_register + .mca_component_name = "ob1", + .mca_component_major_version = OMPI_MAJOR_VERSION, + .mca_component_minor_version = OMPI_MINOR_VERSION, + .mca_component_release_version = OMPI_RELEASE_VERSION, + .mca_open_component = mca_pml_ob1_component_open, + .mca_close_component = mca_pml_ob1_component_close, + .mca_register_component_params = mca_pml_ob1_component_register }, - { + .pmlm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_pml_ob1_component_init, /* component init */ - mca_pml_ob1_component_fini /* component finalize */ - + .pmlm_init = mca_pml_ob1_component_init, + .pmlm_finalize = mca_pml_ob1_component_fini, }; void *mca_pml_ob1_seg_alloc( struct mca_mpool_base_module_t* mpool, diff --git a/ompi/mca/pml/v/pml_v_component.c b/ompi/mca/pml/v/pml_v_component.c index 31c7af0f8d..7cba74891b 100644 --- a/ompi/mca/pml/v/pml_v_component.c +++ b/ompi/mca/pml/v/pml_v_component.c @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2015 The Trustees of the University of Tennessee. * All rights reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,25 +36,23 @@ static int mca_pml_v_enable(bool enable); mca_pml_base_component_2_0_0_t mca_pml_v_component = { - /* First, the mca_base_component_t struct containing meta - * information about the component itself */ - { - MCA_PML_BASE_VERSION_2_0_0, - "v", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_pml_v_component_open, - mca_pml_v_component_close, - NULL, - mca_pml_v_component_register - }, - { - MCA_BASE_METADATA_PARAM_NONE /* Component is not checkpointable */ - }, + /* First, the mca_base_component_t struct containing meta + * information about the component itself */ + .pmlm_version = { + MCA_PML_BASE_VERSION_2_0_0, + .mca_component_name = "v", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = mca_pml_v_component_open, + .mca_close_component = mca_pml_v_component_close, + .mca_register_component_params = mca_pml_v_component_register, + }, + .pmlm_data = { + MCA_BASE_METADATA_PARAM_NONE /* Component is not checkpointable */ + }, - mca_pml_v_component_init, /* component init */ - mca_pml_v_component_finalize /* component finalize */ + .pmlm_init = mca_pml_v_component_init, + .pmlm_finalize = mca_pml_v_component_finalize, }; static bool pml_v_enable_progress_treads = OPAL_ENABLE_PROGRESS_THREADS; diff --git a/ompi/mca/pml/yalla/pml_yalla_component.c b/ompi/mca/pml/yalla/pml_yalla_component.c index 0e7c8edf33..c02f442b68 100644 --- a/ompi/mca/pml/yalla/pml_yalla_component.c +++ b/ompi/mca/pml/yalla/pml_yalla_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (C) Mellanox Technologies Ltd. 2001-2011. ALL RIGHTS RESERVED. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,25 +27,23 @@ mca_pml_base_component_2_0_0_t mca_pml_yalla_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ - { - MCA_PML_BASE_VERSION_2_0_0, + .pmlm_version = { + MCA_PML_BASE_VERSION_2_0_0, - "yalla", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_pml_yalla_component_open, /* component open */ - mca_pml_yalla_component_close, /* component close */ - NULL, - mca_pml_yalla_component_register, - }, - { - /* This component is not checkpoint ready */ - MCA_BASE_METADATA_PARAM_NONE - }, + .mca_component_name = "yalla", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = mca_pml_yalla_component_open, + .mca_close_component = mca_pml_yalla_component_close, + .mca_register_component_params = mca_pml_yalla_component_register, + }, + .pmlm_data = { + /* This component is not checkpoint ready */ + MCA_BASE_METADATA_PARAM_NONE + }, - mca_pml_yalla_component_init, /* component init */ - mca_pml_yalla_component_fini /* component finalize */ + .pmlm_init = mca_pml_yalla_component_init, + .pmlm_finalize = mca_pml_yalla_component_fini, }; static int mca_pml_yalla_component_register(void) diff --git a/ompi/mca/pubsub/orte/pubsub_orte_component.c b/ompi/mca/pubsub/orte/pubsub_orte_component.c index bb679c2989..7638fcbb35 100644 --- a/ompi/mca/pubsub/orte/pubsub_orte_component.c +++ b/ompi/mca/pubsub/orte/pubsub_orte_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,22 +36,21 @@ ompi_pubsub_orte_component_t mca_pubsub_orte_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - OMPI_PUBSUB_BASE_VERSION_2_0_0, + .base_version = { + OMPI_PUBSUB_BASE_VERSION_2_0_0, - "orte", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - pubsub_orte_component_open, /* component open */ - pubsub_orte_component_close, /* component close */ - pubsub_orte_component_query, /* component query */ - pubsub_orte_component_register /* component register */ + .mca_component_name = "orte", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = pubsub_orte_component_open, + .mca_close_component = pubsub_orte_component_close, + .mca_query_component = pubsub_orte_component_query, + .mca_register_component_params = pubsub_orte_component_register, }, - { + .base_data = { /* This component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/ompi/mca/pubsub/pmi/pubsub_pmi_component.c b/ompi/mca/pubsub/pmi/pubsub_pmi_component.c index 88d06c16cb..bb03bc7b6c 100644 --- a/ompi/mca/pubsub/pmi/pubsub_pmi_component.c +++ b/ompi/mca/pubsub/pmi/pubsub_pmi_component.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011-2012 Los Alamos National Security, LLC. All rights + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ @@ -29,22 +29,21 @@ static int pubsub_pmi_component_query(mca_base_module_t **module, int *priority) static int my_priority = 100; /* must be above "orte" component */ ompi_pubsub_base_component_t mca_pubsub_pmi_component = { - { + .base_version = { OMPI_PUBSUB_BASE_VERSION_2_0_0, - "pmi", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - pubsub_pmi_component_open, /* component open */ - pubsub_pmi_component_close, /* component close */ - pubsub_pmi_component_query, /* component query */ - pubsub_pmi_component_register /* component register */ + .mca_component_name = "pmi", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = pubsub_pmi_component_open, + .mca_close_component = pubsub_pmi_component_close, + .mca_query_component = pubsub_pmi_component_query, + .mca_register_component_params = pubsub_pmi_component_register, }, - { + .base_data = { /* This component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int pubsub_pmi_component_register(void) diff --git a/ompi/mca/rte/orte/rte_orte_component.c b/ompi/mca/rte/orte/rte_orte_component.c index 7bd13be168..dd8f9daee1 100644 --- a/ompi/mca/rte/orte/rte_orte_component.c +++ b/ompi/mca/rte/orte/rte_orte_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -49,22 +52,19 @@ ompi_rte_orte_component_t mca_rte_orte_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { OMPI_RTE_BASE_VERSION_1_0_0, /* Component name and version */ - "orte", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "orte", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - rte_orte_open, - rte_orte_close, - NULL, - NULL + .mca_open_component = rte_orte_open, + .mca_close_component = rte_orte_close, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c b/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c index 8b44034e83..79307da19f 100644 --- a/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c +++ b/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c @@ -3,7 +3,7 @@ * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. * Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2014 Los Alamos National Security, LLC. All rights + * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -79,31 +79,26 @@ mca_sbgp_basesmsocket_component_t mca_sbgp_basesmsocket_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .sbgp_version = { MCA_SBGP_BASE_VERSION_2_0_0, /* Component name and version */ - "basesmsocket", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "basesmsocket", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - basesmsocket_open, - basesmsocket_close, - NULL, - basesmsocket_register + .mca_open_component = basesmsocket_open, + .mca_close_component = basesmsocket_close, + .mca_register_component_params = basesmsocket_register, }, - mca_sbgp_basesmsocket_init_query, - mca_sbgp_basesmsocket_select_procs, - - /* (default) priority */ - 0 + .sbgp_init_query = mca_sbgp_basesmsocket_init_query, + .select_procs = mca_sbgp_basesmsocket_select_procs, + .priority = 0, } - }; /* diff --git a/ompi/mca/sbgp/basesmuma/sbgp_basesmuma_component.c b/ompi/mca/sbgp/basesmuma/sbgp_basesmuma_component.c index 2259b9892e..4c6e232860 100644 --- a/ompi/mca/sbgp/basesmuma/sbgp_basesmuma_component.c +++ b/ompi/mca/sbgp/basesmuma/sbgp_basesmuma_component.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -64,31 +64,25 @@ mca_sbgp_basesmuma_component_t mca_sbgp_basesmuma_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .sbgp_version = { MCA_SBGP_BASE_VERSION_2_0_0, /* Component name and version */ - "basesmuma", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "basesmuma", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open, close, and register functions */ - basesmuma_open, - basesmuma_close, - NULL, - basesmuma_register + .mca_open_component = basesmuma_open, + .mca_close_component = basesmuma_close, + .mca_register_component_params = basesmuma_register, }, - mca_sbgp_basesmuma_init_query, - mca_sbgp_basesmuma_select_procs, - - /* (default) priority */ - 0 - + .sbgp_init_query = mca_sbgp_basesmuma_init_query, + .select_procs = mca_sbgp_basesmuma_select_procs, + .priority = 0, } - }; /* diff --git a/ompi/mca/sbgp/ibnet/sbgp_ibnet_component.c b/ompi/mca/sbgp/ibnet/sbgp_ibnet_component.c index f46b309cd1..15df331ad3 100644 --- a/ompi/mca/sbgp/ibnet/sbgp_ibnet_component.c +++ b/ompi/mca/sbgp/ibnet/sbgp_ibnet_component.c @@ -1,9 +1,12 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,27 +65,25 @@ mca_sbgp_ibnet_component_t mca_sbgp_ibnet_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .sbgp_version = { MCA_SBGP_BASE_VERSION_2_0_0, /* Component name and version */ - "ibnet", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "ibnet", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - mca_sbgp_ibnet_open, /* mca_open_component */ - mca_sbgp_ibnet_close, /* mca_close_component */ - NULL, /* mca_query_component */ - mca_sbgp_ibnet_register_params, /* mca_register_component_params */ + .mca_open_component = mca_sbgp_ibnet_open, + .mca_close_component = mca_sbgp_ibnet_close, + .mca_register_component_params = mca_sbgp_ibnet_register_params, }, - mca_sbgp_ibnet_init_query, /* sbgp_init_query */ - mca_sbgp_ibnet_select_procs, /* select_procs */ - 0, /* (default) priority */ + .sbgp_init_query = mca_sbgp_ibnet_init_query, + .select_procs =mca_sbgp_ibnet_select_procs, + .priority = 0, }, /* verbose mode */ diff --git a/ompi/mca/sbgp/p2p/sbgp_p2p_component.c b/ompi/mca/sbgp/p2p/sbgp_p2p_component.c index 6fbee901e2..2fd93da404 100644 --- a/ompi/mca/sbgp/p2p/sbgp_p2p_component.c +++ b/ompi/mca/sbgp/p2p/sbgp_p2p_component.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. - * Copyright (c) 2014 Los Alamos National Security, LLC. All rights + * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -64,29 +64,24 @@ mca_sbgp_p2p_component_t mca_sbgp_p2p_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .sbgp_version = { MCA_SBGP_BASE_VERSION_2_0_0, /* Component name and version */ - "p2p", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "p2p", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* Component open and close functions */ - p2p_open, - p2p_close, - NULL, - p2p_register + .mca_open_component = p2p_open, + .mca_close_component = p2p_close, + .mca_register_component_params = p2p_register, }, - mca_sbgp_p2p_init_query, - /* select function */ - mca_sbgp_p2p_select_procs, - - /* (default) priority */ - 0 + .sbgp_init_query = mca_sbgp_p2p_init_query, + .select_procs = mca_sbgp_p2p_select_procs, + .priority = 0, } }; diff --git a/ompi/mca/sharedfp/addproc/sharedfp_addproc_component.c b/ompi/mca/sharedfp/addproc/sharedfp_addproc_component.c index 53ecccf122..0b66d83bac 100644 --- a/ompi/mca/sharedfp/addproc/sharedfp_addproc_component.c +++ b/ompi/mca/sharedfp/addproc/sharedfp_addproc_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2013 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -53,23 +56,22 @@ mca_sharedfp_base_component_2_0_0_t mca_sharedfp_addproc_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .sharedfpm_version = { MCA_SHAREDFP_BASE_VERSION_2_0_0, /* Component name and version */ - "addproc", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "addproc", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), .mca_register_component_params = addproc_register, }, - { + .sharedfpm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_sharedfp_addproc_component_init_query, /* get thread level */ - mca_sharedfp_addproc_component_file_query, /* get priority and actions */ - mca_sharedfp_addproc_component_file_unquery /* undo what was done by previous function */ + .sharedfpm_init_query = mca_sharedfp_addproc_component_init_query, /* get thread level */ + .sharedfpm_file_query = mca_sharedfp_addproc_component_file_query, /* get priority and actions */ + .sharedfpm_file_unquery = mca_sharedfp_addproc_component_file_unquery, /* undo what was done by previous function */ }; diff --git a/ompi/mca/sharedfp/individual/sharedfp_individual_component.c b/ompi/mca/sharedfp/individual/sharedfp_individual_component.c index ee6aa27315..3e9adcc9be 100644 --- a/ompi/mca/sharedfp/individual/sharedfp_individual_component.c +++ b/ompi/mca/sharedfp/individual/sharedfp_individual_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2013 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -50,23 +53,22 @@ mca_sharedfp_base_component_2_0_0_t mca_sharedfp_individual_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .sharedfpm_version = { MCA_SHAREDFP_BASE_VERSION_2_0_0, /* Component name and version */ - "individual", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "individual", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), .mca_register_component_params = individual_register, }, - { + .sharedfpm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_sharedfp_individual_component_init_query, /* get thread level */ - mca_sharedfp_individual_component_file_query, /* get priority and actions */ - mca_sharedfp_individual_component_file_unquery /* undo what was done by previous function */ + .sharedfpm_init_query = mca_sharedfp_individual_component_init_query, /* get thread level */ + .sharedfpm_file_query = mca_sharedfp_individual_component_file_query, /* get priority and actions */ + .sharedfpm_file_unquery = mca_sharedfp_individual_component_file_unquery, /* undo what was done by previous function */ }; static int individual_register(void) diff --git a/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_component.c b/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_component.c index 0aea03841a..18e0696fe9 100644 --- a/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_component.c +++ b/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2013 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -49,23 +52,22 @@ mca_sharedfp_base_component_2_0_0_t mca_sharedfp_lockedfile_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .sharedfpm_version = { MCA_SHAREDFP_BASE_VERSION_2_0_0, /* Component name and version */ - "lockedfile", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "lockedfile", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), .mca_register_component_params = lockedfile_register, }, - { + .sharedfpm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_sharedfp_lockedfile_component_init_query, /* get thread level */ - mca_sharedfp_lockedfile_component_file_query, /* get priority and actions */ - mca_sharedfp_lockedfile_component_file_unquery /* undo what was done by previous function */ + .sharedfpm_init_query = mca_sharedfp_lockedfile_component_init_query, /* get thread level */ + .sharedfpm_file_query = mca_sharedfp_lockedfile_component_file_query, /* get priority and actions */ + .sharedfpm_file_unquery = mca_sharedfp_lockedfile_component_file_unquery, /* undo what was done by previous function */ }; static int lockedfile_register(void) diff --git a/ompi/mca/sharedfp/sm/sharedfp_sm_component.c b/ompi/mca/sharedfp/sm/sharedfp_sm_component.c index b988cbd294..3f629da8a2 100644 --- a/ompi/mca/sharedfp/sm/sharedfp_sm_component.c +++ b/ompi/mca/sharedfp/sm/sharedfp_sm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2013 University of Houston. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -49,23 +52,22 @@ mca_sharedfp_base_component_2_0_0_t mca_sharedfp_sm_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .sharedfpm_version = { MCA_SHAREDFP_BASE_VERSION_2_0_0, /* Component name and version */ - "sm", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, + .mca_component_name = "sm", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), .mca_register_component_params = sm_register, }, - { + .sharedfpm_data = { /* This component is checkpointable */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_sharedfp_sm_component_init_query, /* get thread level */ - mca_sharedfp_sm_component_file_query, /* get priority and actions */ - mca_sharedfp_sm_component_file_unquery /* undo what was done by previous function */ + .sharedfpm_init_query = mca_sharedfp_sm_component_init_query, /* get thread level */ + .sharedfpm_file_query = mca_sharedfp_sm_component_file_query, /* get priority and actions */ + .sharedfpm_file_unquery =mca_sharedfp_sm_component_file_unquery, /* undo what was done by previous function */ }; static int sm_register(void) diff --git a/ompi/mca/topo/basic/topo_basic_component.c b/ompi/mca/topo/basic/topo_basic_component.c index 1bc36937ef..b0bcc6ffd6 100644 --- a/ompi/mca/topo/basic/topo_basic_component.c +++ b/ompi/mca/topo/basic/topo_basic_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011-2013 The University of Tennessee and The University * of Tennessee Research Foundation. All rights @@ -6,6 +7,8 @@ * Copyright (c) 2011-2013 Université Bordeaux 1 * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -34,24 +37,22 @@ comm_query(const ompi_communicator_t *comm, int *priority, uint32_t type); */ mca_topo_basic_component_t mca_topo_basic_component = { - { + .topoc_version = { MCA_TOPO_BASE_VERSION_2_2_0, - - "basic", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - + .mca_component_name = "basic", + .mca_component_major_version = OMPI_MAJOR_VERSION, + .mca_component_minor_version = OMPI_MINOR_VERSION, + .mca_component_release_version = OMPI_RELEASE_VERSION, /* NULLs for the rest of the function pointers */ }, - { + .topoc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - init_query, - comm_query + .topoc_init_query = init_query, + .topoc_comm_query = comm_query, }; diff --git a/ompi/mca/topo/example/topo_example_component.c b/ompi/mca/topo/example/topo_example_component.c index 90d2d03a45..2e09f3e3a3 100644 --- a/ompi/mca/topo/example/topo_example_component.c +++ b/ompi/mca/topo/example/topo_example_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -39,24 +42,22 @@ comm_query(const ompi_communicator_t *comm, int *priority, uint32_t type); */ mca_topo_base_component_2_2_0_t mca_topo_example_component = { - { + .topoc_version = { MCA_TOPO_BASE_VERSION_2_2_0, - "example", - OMPI_MAJOR_VERSION, - OMPI_MINOR_VERSION, - OMPI_RELEASE_VERSION, - + .mca_component_name = "example", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), /* NULLs for the rest of the function pointers */ }, - { + .topoc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - init_query, - comm_query + .topoc_init_query = init_query, + .topoc_comm_query = comm_query, }; diff --git a/ompi/mca/vprotocol/example/vprotocol_example_component.c b/ompi/mca/vprotocol/example/vprotocol_example_component.c index 63ee88b3f9..96caacea9a 100644 --- a/ompi/mca/vprotocol/example/vprotocol_example_component.c +++ b/ompi/mca/vprotocol/example/vprotocol_example_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,23 +33,22 @@ mca_pml_v_protocol_base_component_2_0_0_t mca_vprotocol_example_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ - { + .pmlm_version = { MCA_VPROTOCOL_BASE_VERSION_2_0_0, - "example", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_vprotocol_example_component_open, /* component open */ - mca_vprotocol_example_component_close /* component close */ + .mca_component_name = "example", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + .mca_open_component = mca_vprotocol_example_component_open, + .mca_close_component = mca_vprotocol_example_component_close, }, - { + .pmlm_data = { /* component is not checkpointable */ MCA_BASE_METADATA_PARAM_NONE }, - mca_vprotocol_example_component_init, /* component init */ - mca_vprotocol_example_component_finalize /* component finalize */ + .pmlm_init = mca_vprotocol_example_component_init, + .pmlm_finalize = mca_vprotocol_example_component_finalize, }; /** MCA level functions diff --git a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c index fccf730ce2..8a226855c8 100644 --- a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c +++ b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_component.c @@ -35,25 +35,24 @@ mca_vprotocol_base_component_2_0_0_t mca_vprotocol_pessimist_component = { /* First, the mca_base_component_t struct containing meta * information about the component itself */ - { - MCA_VPROTOCOL_BASE_VERSION_2_0_0, + .pmlm_version = { + MCA_VPROTOCOL_BASE_VERSION_2_0_0, - "pessimist", /* MCA component name */ - OMPI_MAJOR_VERSION, /* MCA component major version */ - OMPI_MINOR_VERSION, /* MCA component minor version */ - OMPI_RELEASE_VERSION, /* MCA component release version */ - mca_vprotocol_pessimist_component_open, /* component open */ - mca_vprotocol_pessimist_component_close, /* component close */ - NULL, - mca_vprotocol_pessimist_component_register + .mca_component_name = "pessimist", + .mca_component_major_version = OMPI_MAJOR_VERSION, + .mca_component_minor_version = OMPI_MINOR_VERSION, + .mca_component_release_version = OMPI_RELEASE_VERSION, + .mca_open_component = mca_vprotocol_pessimist_component_open, + .mca_close_component = mca_vprotocol_pessimist_component_close, + .mca_register_component_params = mca_vprotocol_pessimist_component_register, }, - { + .pmlm_data = { /* component is not checkpointable */ MCA_BASE_METADATA_PARAM_NONE }, - mca_vprotocol_pessimist_component_init, /* component init */ - mca_vprotocol_pessimist_component_finalize /* component finalize */ + .pmlm_init = mca_vprotocol_pessimist_component_init, + .pmlm_finalize = mca_vprotocol_pessimist_component_finalize, }; /** MCA level functions diff --git a/opal/mca/backtrace/execinfo/backtrace_execinfo_component.c b/opal/mca/backtrace/execinfo/backtrace_execinfo_component.c index 4f3a7fde75..1bda3dd60b 100644 --- a/opal/mca/backtrace/execinfo/backtrace_execinfo_component.c +++ b/opal/mca/backtrace/execinfo/backtrace_execinfo_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,20 +26,15 @@ const opal_backtrace_base_component_2_0_0_t mca_backtrace_execinfo_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .backtracec_version = { OPAL_BACKTRACE_BASE_VERSION_2_0_0, /* Component name and version */ - "execinfo", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, - - /* Component open and close functions */ - NULL, - NULL + .mca_component_name = "execinfo", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), }, - { + .backtracec_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/opal/mca/backtrace/none/backtrace_none_component.c b/opal/mca/backtrace/none/backtrace_none_component.c index af5180e4d7..735d7b37d2 100644 --- a/opal/mca/backtrace/none/backtrace_none_component.c +++ b/opal/mca/backtrace/none/backtrace_none_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,20 +30,15 @@ END_C_DECLS const opal_backtrace_base_component_2_0_0_t mca_backtrace_none_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .backtracec_version = { OPAL_BACKTRACE_BASE_VERSION_2_0_0, /* Component name and version */ - "none", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, - - /* Component open and close functions */ - NULL, - NULL + .mca_component_name = "none", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), }, - { + .backtracec_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/opal/mca/backtrace/printstack/backtrace_printstack_component.c b/opal/mca/backtrace/printstack/backtrace_printstack_component.c index 3f831bb8d2..77f179accb 100644 --- a/opal/mca/backtrace/printstack/backtrace_printstack_component.c +++ b/opal/mca/backtrace/printstack/backtrace_printstack_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,20 +26,15 @@ const opal_backtrace_base_component_2_0_0_t mca_backtrace_printstack_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .backtracec_version = { OPAL_BACKTRACE_BASE_VERSION_2_0_0, /* Component name and version */ - "printstack", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, - - /* Component open and close functions */ - NULL, - NULL + .mca_component_name = "printstack", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), }, - { + .backtracec_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/opal/mca/btl/btl.h b/opal/mca/btl/btl.h index b3d4e61c4e..eeaf64a83b 100644 --- a/opal/mca/btl/btl.h +++ b/opal/mca/btl/btl.h @@ -1171,9 +1171,8 @@ typedef struct mca_btl_base_module_t mca_btl_base_module_t; #define MCA_BTL_DEFAULT_VERSION(name) \ MCA_BTL_BASE_VERSION_3_0_0, \ .mca_component_name = name, \ - .mca_component_major_version = OPAL_MAJOR_VERSION, \ - .mca_component_minor_version = OPAL_MINOR_VERSION, \ - .mca_component_release_version = OPAL_RELEASE_VERSION \ + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, \ + OPAL_RELEASE_VERSION) END_C_DECLS diff --git a/opal/mca/compress/bzip/compress_bzip_component.c b/opal/mca/compress/bzip/compress_bzip_component.c index 1ad3eff6bb..c43242813a 100644 --- a/opal/mca/compress/bzip/compress_bzip_component.c +++ b/opal/mca/compress/bzip/compress_bzip_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,30 +41,27 @@ opal_compress_bzip_component_t mca_compress_bzip_component = { /* Handle the general mca_component_t struct containing * meta information about the component itbzip */ - { + .base_version = { OPAL_COMPRESS_BASE_VERSION_2_0_0, /* Component name and version */ - "bzip", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "bzip", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - compress_bzip_open, - compress_bzip_close, - opal_compress_bzip_component_query, - compress_bzip_register + .mca_open_component = compress_bzip_open, + .mca_close_component = compress_bzip_close, + .mca_query_component = opal_compress_bzip_component_query, + .mca_register_component_params = compress_bzip_register }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - - /* Verbosity level */ - 0, - /* opal_output handler */ - -1 + + .verbose = 0, + .output_handle = -1, } }; diff --git a/opal/mca/compress/gzip/compress_gzip_component.c b/opal/mca/compress/gzip/compress_gzip_component.c index 87678a30cb..368ba687a2 100644 --- a/opal/mca/compress/gzip/compress_gzip_component.c +++ b/opal/mca/compress/gzip/compress_gzip_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,30 +41,27 @@ opal_compress_gzip_component_t mca_compress_gzip_component = { /* Handle the general mca_component_t struct containing * meta information about the component itgzip */ - { + .base_version = { OPAL_COMPRESS_BASE_VERSION_2_0_0, /* Component name and version */ - "gzip", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "gzip", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - compress_gzip_open, - compress_gzip_close, - opal_compress_gzip_component_query, - compress_gzip_register + .mca_open_component = compress_gzip_open, + .mca_close_component = compress_gzip_close, + .mca_query_component = opal_compress_gzip_component_query, + .mca_register_component_params = compress_gzip_register }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - - /* Verbosity level */ - 0, - /* opal_output handler */ - -1 + + .verbose = 0, + .output_handle = -1, } }; diff --git a/opal/mca/crs/blcr/crs_blcr_component.c b/opal/mca/crs/blcr/crs_blcr_component.c index 638f60b287..65b71c64cd 100644 --- a/opal/mca/crs/blcr/crs_blcr_component.c +++ b/opal/mca/crs/blcr/crs_blcr_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2009 The Trustees of Indiana University. * All rights reserved. @@ -7,6 +8,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -42,30 +45,27 @@ opal_crs_blcr_component_t mca_crs_blcr_component = { /* Handle the general mca_component_t struct containing * meta information about the component itself */ - { + .base_version = { OPAL_CRS_BASE_VERSION_2_0_0, /* Component name and version */ - "blcr", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "blcr", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - crs_blcr_open, - crs_blcr_close, - opal_crs_blcr_component_query, - crs_blcr_register + .mca_open_component = crs_blcr_open, + .mca_close_component = crs_blcr_close, + .mca_query_component = opal_crs_blcr_component_query, + .mca_register_component_params = crs_blcr_register }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - /* Verbosity level */ - 0, - /* opal_output handler */ - -1 + .verbose = 0, + .output_handle = -1, } }; diff --git a/opal/mca/crs/criu/crs_criu_component.c b/opal/mca/crs/criu/crs_criu_component.c index 15b43adc9f..e56be920c7 100644 --- a/opal/mca/crs/criu/crs_criu_component.c +++ b/opal/mca/crs/criu/crs_criu_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2009 The Trustees of Indiana University. * All rights reserved. @@ -8,6 +9,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2014 Hochschule Esslingen. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -40,30 +43,27 @@ opal_crs_criu_component_t mca_crs_criu_component = { /* Handle the general mca_component_t struct containing * meta information about the component itself */ - { + .base_version = { OPAL_CRS_BASE_VERSION_2_0_0, /* Component name and version */ - "criu", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "criu", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - crs_criu_open, - crs_criu_close, - opal_crs_criu_component_query, - crs_criu_register + .mca_open_component = crs_criu_open, + .mca_close_component = crs_criu_close, + .mca_query_component = opal_crs_criu_component_query, + .mca_register_component_params = crs_criu_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - /* Verbosity level */ - 0, - /* opal_output handler */ - -1 + .verbose = 0, + .output_handle = -1, }, /* criu log file */ LOG_FILE, diff --git a/opal/mca/crs/dmtcp/crs_dmtcp_component.c b/opal/mca/crs/dmtcp/crs_dmtcp_component.c index 57ced08363..76f2502027 100644 --- a/opal/mca/crs/dmtcp/crs_dmtcp_component.c +++ b/opal/mca/crs/dmtcp/crs_dmtcp_component.c @@ -1,8 +1,11 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 The Trustees of Indiana University. * All rights reserved. * Copyright (c) 2010-2011 Alex Brick . * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -37,30 +40,27 @@ opal_crs_dmtcp_component_t mca_crs_dmtcp_component = { /* Handle the general mca_component_t struct containing * meta information about the component itself */ - { + .base_version = { OPAL_CRS_BASE_VERSION_2_0_0, /* Component name and version */ - "dmtcp", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "dmtcp", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - crs_dmtcp_open, - crs_dmtcp_close, - opal_crs_dmtcp_component_query, - crs_dmtcp_register + .mca_open_component = crs_dmtcp_open, + .mca_close_component = crs_dmtcp_close, + .mca_query_component = opal_crs_dmtcp_component_query, + .mca_register_component_params = crs_dmtcp_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - - /* Verbosity level */ - 0, - /* opal_output handler */ - -1 + + .verbose = 0, + .output_handle = -1 } }; diff --git a/opal/mca/crs/none/crs_none_component.c b/opal/mca/crs/none/crs_none_component.c index 9c6d318a59..e7ce2ee907 100644 --- a/opal/mca/crs/none/crs_none_component.c +++ b/opal/mca/crs/none/crs_none_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2009 The Trustees of Indiana University. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,32 +41,28 @@ opal_crs_none_component_t mca_crs_none_component = { /* Handle the general mca_component_t struct containing * meta information about the component itnone */ - { + .base_version = { OPAL_CRS_BASE_VERSION_2_0_0, /* Component name and version */ - "none", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "none", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - crs_none_open, - crs_none_close, - opal_crs_none_component_query, - crs_none_register + .mca_open_component = crs_none_open, + .mca_close_component = crs_none_close, + .mca_query_component = opal_crs_none_component_query, + .mca_register_component_params = crs_none_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - - /* Verbosity level */ - 0, - /* opal_output handler */ - -1, - /* Default priority */ - 1 + + .verbose = 0, + .output_handle = -1, + .priority = 1, } }; diff --git a/opal/mca/crs/self/crs_self_component.c b/opal/mca/crs/self/crs_self_component.c index eb45d592b1..7a684fbc98 100644 --- a/opal/mca/crs/self/crs_self_component.c +++ b/opal/mca/crs/self/crs_self_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2009 The Trustees of Indiana University. * All rights reserved. @@ -7,6 +8,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, Inc. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -45,20 +48,19 @@ opal_crs_self_component_t mca_crs_self_component = { /* Handle the general mca_component_t struct containing * meta information about the component itself */ - { + .base_version = { OPAL_CRS_BASE_VERSION_2_0_0, /* Component name and version */ - "self", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "self", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - crs_self_open, - crs_self_close, - opal_crs_self_component_query, - crs_self_register + .mca_open_component = crs_self_open, + .mca_close_component = crs_self_close, + .mca_query_component = opal_crs_self_component_query, + .mca_register_component_params = crs_self_register, }, { /* The component is checkpoint ready */ diff --git a/opal/mca/dl/dlopen/dl_dlopen_component.c b/opal/mca/dl/dlopen/dl_dlopen_component.c index 8cc5d47e00..97f8872f14 100644 --- a/opal/mca/dl/dlopen/dl_dlopen_component.c +++ b/opal/mca/dl/dlopen/dl_dlopen_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -47,10 +50,9 @@ opal_dl_dlopen_component_t mca_dl_dlopen_component = { OPAL_DL_BASE_VERSION_1_0_0, /* Component name and version */ - "dlopen", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "dlopen", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component functions */ .mca_register_component_params = dlopen_component_register, diff --git a/opal/mca/dl/libltdl/dl_libltdl_component.c b/opal/mca/dl/libltdl/dl_libltdl_component.c index e11c051b64..5855bf0a31 100644 --- a/opal/mca/dl/libltdl/dl_libltdl_component.c +++ b/opal/mca/dl/libltdl/dl_libltdl_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, Inc. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -48,10 +51,9 @@ opal_dl_libltdl_component_t mca_dl_libltdl_component = { OPAL_DL_BASE_VERSION_1_0_0, /* Component name and version */ - "libltdl", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "libltdl", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component functions */ .mca_register_component_params = libltdl_component_register, diff --git a/opal/mca/dstore/hash/dstore_hash_component.c b/opal/mca/dstore/hash/dstore_hash_component.c index 64b4e851d6..bbed898a67 100644 --- a/opal/mca/dstore/hash/dstore_hash_component.c +++ b/opal/mca/dstore/hash/dstore_hash_component.c @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. * Copyright (c) 2013-2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,28 +36,22 @@ static int dstore_hash_query(mca_base_module_t **module, int *priority); * and pointers to our public functions in it */ opal_dstore_base_component_t mca_dstore_hash_component = { - { + .base_version = { OPAL_DSTORE_BASE_VERSION_2_0_0, /* Component name and version */ - "hash", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "hash", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - NULL, - NULL, - dstore_hash_query, - NULL + .mca_query_component = dstore_hash_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - component_create, - NULL, - NULL + .create_handle = component_create, }; static int dstore_hash_query(mca_base_module_t **module, int *priority) diff --git a/opal/mca/dstore/sm/dstore_sm_component.c b/opal/mca/dstore/sm/dstore_sm_component.c index fef893078d..55eddc4b62 100644 --- a/opal/mca/dstore/sm/dstore_sm_component.c +++ b/opal/mca/dstore/sm/dstore_sm_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* Copyright (c) 2014 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,28 +35,23 @@ static int component_register(void); * and pointers to our public functions in it */ opal_dstore_base_component_t mca_dstore_sm_component = { - { + .base_version = { OPAL_DSTORE_BASE_VERSION_2_0_0, /* Component name and version */ - "sm", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "sm", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), - /* Component open and close functions */ - NULL, - NULL, - dstore_sm_query, - component_register + .mca_query_component = dstore_sm_query, + .mca_register_component_params = component_register }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - component_create, - component_update, - NULL + .create_handle = component_create, + .update_handle = component_update, }; static int dstore_sm_query(mca_base_module_t **module, int *priority) diff --git a/opal/mca/event/external/event_external_component.c b/opal/mca/event/external/event_external_component.c index afee1c5a5b..acf2120c40 100644 --- a/opal/mca/event/external/event_external_component.c +++ b/opal/mca/event/external/event_external_component.c @@ -1,6 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved. + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -37,20 +39,18 @@ const opal_event_component_t mca_event_external_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { OPAL_EVENT_BASE_VERSION_2_0_0, /* Component name and version */ - "external", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "external", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - event_external_open, - NULL + .mca_open_component = event_external_open, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/event/libevent2022/libevent2022_component.c b/opal/mca/event/libevent2022/libevent2022_component.c index 5df6b690af..632a5ad0a4 100644 --- a/opal/mca/event/libevent2022/libevent2022_component.c +++ b/opal/mca/event/libevent2022/libevent2022_component.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. * * $COPYRIGHT$ @@ -102,20 +102,19 @@ const opal_event_component_t mca_event_libevent2022_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { OPAL_EVENT_BASE_VERSION_2_0_0, /* Component name and version */ - "libevent2022", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "libevent2022", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component functions */ .mca_open_component = libevent2022_open, .mca_register_component_params = libevent2022_register }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/hwloc/external/hwloc_external_component.c b/opal/mca/hwloc/external/hwloc_external_component.c index 508da98373..690beab2bf 100644 --- a/opal/mca/hwloc/external/hwloc_external_component.c +++ b/opal/mca/hwloc/external/hwloc_external_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -36,23 +39,21 @@ const opal_hwloc_component_t mca_hwloc_external_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { OPAL_HWLOC_BASE_VERSION_2_0_0, /* Component name and version */ - "external", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "external", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - hwloc_external_open, - NULL + .mca_open_component = hwloc_external_open, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int hwloc_external_open(void) diff --git a/opal/mca/hwloc/hwloc191/hwloc191_component.c b/opal/mca/hwloc/hwloc191/hwloc191_component.c index 56d1eed86f..fa2a8363fe 100644 --- a/opal/mca/hwloc/hwloc191/hwloc191_component.c +++ b/opal/mca/hwloc/hwloc191/hwloc191_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -37,20 +40,15 @@ const opal_hwloc_component_t mca_hwloc_hwloc191_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { OPAL_HWLOC_BASE_VERSION_2_0_0, /* Component name and version */ - "hwloc191", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, - - /* Component open and close functions */ - NULL, - NULL + .mca_component_name = "hwloc191", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/mca.h b/opal/mca/mca.h index 481163d42d..0bd945c160 100644 --- a/opal/mca/mca.h +++ b/opal/mca/mca.h @@ -361,18 +361,20 @@ typedef struct mca_base_component_data_2_0_0_t mca_base_component_data_2_0_0_t; #define MCA_BASE_VERSION_MINOR 1 #define MCA_BASE_VERSION_RELEASE 0 -#define MCA_BASE_VERSION_2_1_0(project, project_major, project_minor, project_release, type, type_major, type_minor, type_release) \ +#define MCA_BASE_MAKE_VERSION(level, MAJOR, MINOR, RELEASE) \ + .mca_## level ##_major_version = MAJOR, \ + .mca_## level ##_minor_version = MINOR, \ + .mca_## level ##_release_version = RELEASE + + +#define MCA_BASE_VERSION_2_1_0(PROJECT, project_major, project_minor, project_release, TYPE, type_major, type_minor, type_release) \ .mca_major_version = MCA_BASE_VERSION_MAJOR, \ .mca_minor_version = MCA_BASE_VERSION_MINOR, \ .mca_release_version = MCA_BASE_VERSION_RELEASE, \ - .mca_project_name = project, \ - .mca_project_major_version = project_major, \ - .mca_project_minor_version = project_minor, \ - .mca_project_release_version = project_release, \ - .mca_type_name = type, \ - .mca_type_major_version = type_major, \ - .mca_type_minor_version = type_minor, \ - .mca_type_release_version = type_release + .mca_project_name = PROJECT, \ + MCA_BASE_MAKE_VERSION(project, project_major, project_minor, project_release), \ + .mca_type_name = TYPE, \ + MCA_BASE_MAKE_VERSION(type, type_major, type_minor, type_release) #define OPAL_MCA_BASE_VERSION_2_1_0(type, type_major, type_minor, type_release) \ MCA_BASE_VERSION_2_1_0("opal", OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION, type, type_major, type_minor, type_release) diff --git a/opal/mca/memchecker/valgrind/memchecker_valgrind_component.c b/opal/mca/memchecker/valgrind/memchecker_valgrind_component.c index d28058f427..b8a1eb2545 100644 --- a/opal/mca/memchecker/valgrind/memchecker_valgrind_component.c +++ b/opal/mca/memchecker/valgrind/memchecker_valgrind_component.c @@ -1,10 +1,12 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. - * * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -50,22 +52,21 @@ const opal_memchecker_base_component_2_0_0_t mca_memchecker_valgrind_component = /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { OPAL_MEMCHECKER_BASE_VERSION_2_0_0, /* Component name and version */ - "valgrind", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "valgrind", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - valgrind_open, - valgrind_close, - opal_memchecker_valgrind_component_query, - valgrind_register + .mca_open_component = valgrind_open, + .mca_close_component = valgrind_close, + .mca_query_component = opal_memchecker_valgrind_component_query, + .mca_register_component_params = valgrind_register }, - { + .base_data = { /* Valgrind does not offer functionality to save the state */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/memory/linux/memory_linux_component.c b/opal/mca/memory/linux/memory_linux_component.c index 4f0af66dda..03de333544 100644 --- a/opal/mca/memory/linux/memory_linux_component.c +++ b/opal/mca/memory/linux/memory_linux_component.c @@ -11,8 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2013 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -68,22 +68,20 @@ opal_memory_linux_component_t mca_memory_linux_component = { { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .memoryc_version = { OPAL_MEMORY_BASE_VERSION_2_0_0, /* Component name and version */ - "linux", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "linux", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - linux_open, - linux_close, - NULL, - linux_register, + .mca_open_component = linux_open, + .mca_close_component = linux_close, + .mca_register_component_params = linux_register, }, - { + .memoryc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, @@ -91,9 +89,8 @@ opal_memory_linux_component_t mca_memory_linux_component = { /* Memory framework functions. These function pointer values are replaced by memory_linux_ummunotify.c at run time if we end up using ummunotify support. */ - NULL, - opal_memory_base_component_register_empty, - opal_memory_base_component_deregister_empty + .memoryc_register = opal_memory_base_component_register_empty, + .memoryc_deregister = opal_memory_base_component_deregister_empty, }, /* Component-specific data, filled in later (compiler will 0/NULL diff --git a/opal/mca/memory/malloc_solaris/memory_malloc_solaris_component.c b/opal/mca/memory/malloc_solaris/memory_malloc_solaris_component.c index 0387dc66d4..d562949294 100644 --- a/opal/mca/memory/malloc_solaris/memory_malloc_solaris_component.c +++ b/opal/mca/memory/malloc_solaris/memory_malloc_solaris_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2007-2011 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009-2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -45,29 +48,26 @@ static int opal_memory_malloc_open(void); const opal_memory_base_component_2_0_0_t mca_memory_malloc_solaris_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .memoryc_version = { OPAL_MEMORY_BASE_VERSION_2_0_0, /* Component name and version */ - "malloc_solaris", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "malloc_solaris", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - opal_memory_malloc_open, - NULL + .mca_open_component = opal_memory_malloc_open, }, - { + .memoryc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* This component doesn't need these functions, but need to provide safe/empty register/deregister functions to call */ - NULL, - opal_memory_base_component_register_empty, - opal_memory_base_component_deregister_empty, + .memoryc_register = opal_memory_base_component_register_empty, + .memoryc_deregister = opal_memory_base_component_deregister_empty, }; /* diff --git a/opal/mca/mpool/gpusm/mpool_gpusm_component.c b/opal/mca/mpool/gpusm/mpool_gpusm_component.c index 5b115b341c..9a444e1466 100644 --- a/opal/mca/mpool/gpusm/mpool_gpusm_component.c +++ b/opal/mca/mpool/gpusm/mpool_gpusm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -12,6 +13,8 @@ * Copyright (c) 2006 Voltaire. All rights reserved. * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 NVIDIA Corporation. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -44,24 +47,22 @@ mca_mpool_gpusm_component_t mca_mpool_gpusm_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - MCA_MPOOL_BASE_VERSION_2_0_0, + .mpool_version = { + MCA_MPOOL_BASE_VERSION_2_0_0, - "gpusm", /* MCA component name */ - OPAL_MAJOR_VERSION, /* MCA component major version */ - OPAL_MINOR_VERSION, /* MCA component minor version */ - OPAL_RELEASE_VERSION, /* MCA component release version */ - gpusm_open, /* component open */ - gpusm_close, - NULL, - gpusm_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, + .mca_component_name = "gpusm", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), + .mca_open_component = gpusm_open, + .mca_close_component = gpusm_close, + .mca_register_component_params = gpusm_register, + }, + .mpool_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, - gpusm_init + .mpool_init = gpusm_init, } }; diff --git a/opal/mca/mpool/grdma/mpool_grdma_component.c b/opal/mca/mpool/grdma/mpool_grdma_component.c index 98946f1e0e..2247768bf1 100644 --- a/opal/mca/mpool/grdma/mpool_grdma_component.c +++ b/opal/mca/mpool/grdma/mpool_grdma_component.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2006 Voltaire. All rights reserved. * Copyright (c) 2007-2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. * * $COPYRIGHT$ @@ -47,24 +47,22 @@ mca_mpool_grdma_component_t mca_mpool_grdma_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - MCA_MPOOL_BASE_VERSION_2_0_0, + .mpool_version = { + MCA_MPOOL_BASE_VERSION_2_0_0, - "grdma", /* MCA component name */ - OPAL_MAJOR_VERSION, /* MCA component major version */ - OPAL_MINOR_VERSION, /* MCA component minor version */ - OPAL_RELEASE_VERSION, /* MCA component release version */ - grdma_open, /* component open */ - grdma_close, - NULL, - grdma_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, + .mca_component_name = "grdma", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), + .mca_open_component = grdma_open, + .mca_close_component = grdma_close, + .mca_register_component_params = grdma_register, + }, + .mpool_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, - grdma_init + .mpool_init = grdma_init, } }; diff --git a/opal/mca/mpool/rgpusm/mpool_rgpusm_component.c b/opal/mca/mpool/rgpusm/mpool_rgpusm_component.c index 4dfa2d03d5..20179db463 100644 --- a/opal/mca/mpool/rgpusm/mpool_rgpusm_component.c +++ b/opal/mca/mpool/rgpusm/mpool_rgpusm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology @@ -12,6 +13,8 @@ * Copyright (c) 2006 Voltaire. All rights reserved. * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 NVIDIA Corporation. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -43,27 +46,25 @@ static int opal_mpool_rgpusm_verbose = 0; mca_mpool_rgpusm_component_t mca_mpool_rgpusm_component = { { - /* First, the mca_base_component_t struct containing meta - information about the component itself */ + /* First, the mca_base_component_t struct containing meta + information about the component itself */ - { - MCA_MPOOL_BASE_VERSION_2_0_0, + .mpool_version = { + MCA_MPOOL_BASE_VERSION_2_0_0, - "rgpusm", /* MCA component name */ - OPAL_MAJOR_VERSION, /* MCA component major version */ - OPAL_MINOR_VERSION, /* MCA component minor version */ - OPAL_RELEASE_VERSION, /* MCA component release version */ - rgpusm_open, /* component open */ - rgpusm_close, - NULL, - rgpusm_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, + .mca_component_name = "rgpusm", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), + .mca_open_component = rgpusm_open, + .mca_close_component = rgpusm_close, + .mca_register_component_params = rgpusm_register, + }, + .mpool_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, - rgpusm_init + .mpool_init = rgpusm_init } }; diff --git a/opal/mca/mpool/sm/mpool_sm_component.c b/opal/mca/mpool/sm/mpool_sm_component.c index e5583aa1ea..644389a449 100644 --- a/opal/mca/mpool/sm/mpool_sm_component.c +++ b/opal/mca/mpool/sm/mpool_sm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,8 +12,8 @@ * All rights reserved. * Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2010-2013 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2014 NVIDIA Corporation. All rights reserved. * $COPYRIGHT$ * @@ -59,24 +60,22 @@ mca_mpool_sm_component_t mca_mpool_sm_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - MCA_MPOOL_BASE_VERSION_2_0_0, + .mpool_version = { + MCA_MPOOL_BASE_VERSION_2_0_0, - "sm", /* MCA component name */ - OPAL_MAJOR_VERSION, /* MCA component major version */ - OPAL_MINOR_VERSION, /* MCA component minor version */ - OPAL_RELEASE_VERSION, /* MCA component release version */ - mca_mpool_sm_open, /* component open */ - mca_mpool_sm_close, - NULL, - mca_mpool_sm_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, + .mca_component_name = "sm", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), + .mca_open_component = mca_mpool_sm_open, + .mca_close_component = mca_mpool_sm_close, + .mca_register_component_params = mca_mpool_sm_register, + }, + .mpool_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, - mca_mpool_sm_init + .mpool_init = mca_mpool_sm_init, } }; diff --git a/opal/mca/mpool/udreg/mpool_udreg_component.c b/opal/mca/mpool/udreg/mpool_udreg_component.c index a7c77a6103..64e7da92e0 100644 --- a/opal/mca/mpool/udreg/mpool_udreg_component.c +++ b/opal/mca/mpool/udreg/mpool_udreg_component.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2006 Voltaire. All rights reserved. * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. * * $COPYRIGHT$ @@ -47,27 +47,25 @@ static mca_mpool_base_module_t* udreg_init( mca_mpool_udreg_component_t mca_mpool_udreg_component = { { - /* First, the mca_base_component_t struct containing meta - information about the component itself */ + /* First, the mca_base_component_t struct containing meta + information about the component itself */ - { - MCA_MPOOL_BASE_VERSION_2_0_0, + .mpool_version ={ + MCA_MPOOL_BASE_VERSION_2_0_0, - "udreg", /* MCA component name */ - OPAL_MAJOR_VERSION, /* MCA component major version */ - OPAL_MINOR_VERSION, /* MCA component minor version */ - OPAL_RELEASE_VERSION, /* MCA component release version */ - udreg_open, /* component open */ - udreg_close, - NULL, - udreg_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, + .mca_component_name = "udreg", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), + .mca_open_component = udreg_open, + .mca_close_component = udreg_close, + .mca_register_component_params = udreg_register, + }, + .mpool_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, - udreg_init + .mpool_init = udreg_init } }; diff --git a/opal/mca/pmix/cray/pmix_cray_component.c b/opal/mca/pmix/cray/pmix_cray_component.c index 738d99831f..75e6dc67e6 100644 --- a/opal/mca/pmix/cray/pmix_cray_component.c +++ b/opal/mca/pmix/cray/pmix_cray_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -45,7 +48,7 @@ opal_pmix_cray_component_t mca_pmix_cray_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { /* Indicate that we are a pmix v1.1.0 component (which also implies a specific MCA version) */ @@ -53,20 +56,18 @@ opal_pmix_cray_component_t mca_pmix_cray_component = { /* Component name and version */ - "cray", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "cray", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - pmix_cray_component_open, - pmix_cray_component_close, - pmix_cray_component_query, - NULL + .mca_open_component = pmix_cray_component_open, + .mca_close_component = pmix_cray_component_close, + .mca_query_component = pmix_cray_component_query, }, /* Next the MCA v1.0.0 component meta data */ - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/pmix/native/pmix_native_component.c b/opal/mca/pmix/native/pmix_native_component.c index ce77df39d1..486426f53e 100644 --- a/opal/mca/pmix/native/pmix_native_component.c +++ b/opal/mca/pmix/native/pmix_native_component.c @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -47,7 +50,7 @@ opal_pmix_native_component_t mca_pmix_native_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { /* Indicate that we are a pmix v1.1.0 component (which also implies a specific MCA version) */ @@ -55,20 +58,18 @@ opal_pmix_native_component_t mca_pmix_native_component = { /* Component name and version */ - "native", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "native", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - pmix_native_open, - pmix_native_close, - pmix_native_component_query, - NULL + .mca_open_component = pmix_native_open, + .mca_close_component = pmix_native_close, + .mca_query_component = pmix_native_component_query, }, /* Next the MCA v1.0.0 component meta data */ - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/pmix/s1/pmix_s1_component.c b/opal/mca/pmix/s1/pmix_s1_component.c index 4c13a06cd3..8b127a2e07 100644 --- a/opal/mca/pmix/s1/pmix_s1_component.c +++ b/opal/mca/pmix/s1/pmix_s1_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -42,7 +45,7 @@ opal_pmix_base_component_t mca_pmix_s1_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { /* Indicate that we are a pmix v1.1.0 component (which also implies a specific MCA version) */ @@ -50,24 +53,20 @@ opal_pmix_base_component_t mca_pmix_s1_component = { /* Component name and version */ - "s1", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "s1", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - - NULL, - NULL, - pmix_s1_component_query, - pmix_s1_component_register + .mca_query_component = pmix_s1_component_query, + .mca_register_component_params = pmix_s1_component_register, }, /* Next the MCA v1.0.0 component meta data */ - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - 10 /*component priority */ + .priority = 10, }; static int pmix_s1_component_register(void) diff --git a/opal/mca/pmix/s2/pmix_s2_component.c b/opal/mca/pmix/s2/pmix_s2_component.c index 604129ab75..52497c133e 100644 --- a/opal/mca/pmix/s2/pmix_s2_component.c +++ b/opal/mca/pmix/s2/pmix_s2_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -42,7 +45,7 @@ opal_pmix_base_component_t mca_pmix_s2_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { /* Indicate that we are a pmix v1.1.0 component (which also implies a specific MCA version) */ @@ -50,24 +53,19 @@ opal_pmix_base_component_t mca_pmix_s2_component = { /* Component name and version */ - "s2", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "s2", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), - /* Component open and close functions */ - - NULL, - NULL, - pmix_s2_component_query, - pmix_s2_component_register + .mca_query_component = pmix_s2_component_query, + .mca_register_component_params = pmix_s2_component_register, }, /* Next the MCA v1.0.0 component meta data */ - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - 20 /* component priority */ + .priority = 20, }; diff --git a/opal/mca/pstat/linux/pstat_linux_component.c b/opal/mca/pstat/linux/pstat_linux_component.c index 3c5a1e532b..91d8bd28e8 100644 --- a/opal/mca/pstat/linux/pstat_linux_component.c +++ b/opal/mca/pstat/linux/pstat_linux_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -50,25 +53,20 @@ const opal_pstat_base_component_t mca_pstat_linux_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { OPAL_PSTAT_BASE_VERSION_2_0_0, /* Component name and version */ - "linux", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "linux", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), - /* Component open and close functions */ - NULL, - NULL, - pstat_linux_component_query, - NULL, + .mca_query_component = pstat_linux_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/opal/mca/pstat/test/pstat_test_component.c b/opal/mca/pstat/test/pstat_test_component.c index 2c98cdcb0e..0e7fce0370 100644 --- a/opal/mca/pstat/test/pstat_test_component.c +++ b/opal/mca/pstat/test/pstat_test_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -51,7 +54,7 @@ const opal_pstat_base_component_t mca_pstat_test_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { /* Indicate that we are a pstat v1.1.0 component (which also implies a specific MCA version) */ @@ -59,20 +62,14 @@ const opal_pstat_base_component_t mca_pstat_test_component = { /* Component name and version */ - "test", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "test", + MCA_BASE_MAKE_VERSION (component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), - /* Component open and close functions */ - - NULL, - NULL, - pstat_test_component_query, - NULL + .mca_query_component = pstat_test_component_query, }, /* Next the MCA v1.0.0 component meta data */ - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/rcache/vma/rcache_vma_component.c b/opal/mca/rcache/vma/rcache_vma_component.c index 309eaa79aa..7119e07bed 100644 --- a/opal/mca/rcache/vma/rcache_vma_component.c +++ b/opal/mca/rcache/vma/rcache_vma_component.c @@ -1,8 +1,11 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2006-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2006 Voltaire. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -22,21 +25,19 @@ static mca_rcache_base_module_t* mca_rcache_vma_component_init( void ); mca_rcache_vma_component_t mca_rcache_vma_component = { { - { + .rcache_version = { MCA_RCACHE_BASE_VERSION_2_0_0, - "vma", /* MCA component name */ - OPAL_MAJOR_VERSION, /* MCA component major version */ - OPAL_MINOR_VERSION, /* MCA component minor version */ - OPAL_RELEASE_VERSION, /* MCA component release version */ - mca_rcache_vma_component_open, /* component open */ - NULL + .mca_component_name = "vma", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), + .mca_open_component = mca_rcache_vma_component_open, }, - { + .rcache_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_rcache_vma_component_init + .rcache_init = mca_rcache_vma_component_init, } }; diff --git a/opal/mca/reachable/netlink/reachable_netlink_component.c b/opal/mca/reachable/netlink/reachable_netlink_component.c index cdab9d0b89..f958eb75c4 100644 --- a/opal/mca/reachable/netlink/reachable_netlink_component.c +++ b/opal/mca/reachable/netlink/reachable_netlink_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -40,7 +43,7 @@ opal_reachable_base_component_t mca_reachable_netlink_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { /* Indicate that we are a reachable v1.1.0 component (which also implies a specific MCA version) */ @@ -48,20 +51,19 @@ opal_reachable_base_component_t mca_reachable_netlink_component = { /* Component name and version */ - "netlink", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "netlink", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - reachable_netlink_open, - reachable_netlink_close, - reachable_netlink_component_query, - component_register + .mca_open_component = reachable_netlink_open, + .mca_close_component = reachable_netlink_close, + .mca_query_component = reachable_netlink_component_query, + .mca_register_component_params = component_register, }, /* Next the MCA v1.0.0 component meta data */ - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/reachable/weighted/reachable_weighted_component.c b/opal/mca/reachable/weighted/reachable_weighted_component.c index f2e1afe51a..fbbd27308e 100644 --- a/opal/mca/reachable/weighted/reachable_weighted_component.c +++ b/opal/mca/reachable/weighted/reachable_weighted_component.c @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -48,7 +51,7 @@ opal_reachable_weighted_component_t mca_reachable_weighted_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { /* Indicate that we are a reachable v1.1.0 component (which also implies a specific MCA version) */ @@ -56,23 +59,22 @@ opal_reachable_weighted_component_t mca_reachable_weighted_component = { /* Component name and version */ - "weighted", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "weighted", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - reachable_weighted_open, - reachable_weighted_close, - reachable_weighted_component_query, - component_register + .mca_open_component = reachable_weighted_open, + .mca_close_component = reachable_weighted_close, + .mca_query_component = reachable_weighted_component_query, + .mca_register_component_params = component_register, }, /* Next the MCA v1.0.0 component meta data */ - { + .base_version = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/opal/mca/sec/basic/sec_basic_component.c b/opal/mca/sec/basic/sec_basic_component.c index 809800a48e..2b66685b29 100644 --- a/opal/mca/sec/basic/sec_basic_component.c +++ b/opal/mca/sec/basic/sec_basic_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,22 +28,20 @@ static int sec_basic_component_close(void); * and pointers to our public functions in it */ opal_sec_base_component_t mca_sec_basic_component = { - { + .base_version = { OPAL_SEC_BASE_VERSION_1_0_0, /* Component name and version */ - "basic", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "basic", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - sec_basic_component_open, - sec_basic_component_close, - sec_basic_component_query, - NULL + .mca_open_component = sec_basic_component_open, + .mca_close_component = sec_basic_component_close, + .mca_query_component = sec_basic_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/sec/keystone/sec_keystone_component.c b/opal/mca/sec/keystone/sec_keystone_component.c index 8a4effc031..3445f08df2 100644 --- a/opal/mca/sec/keystone/sec_keystone_component.c +++ b/opal/mca/sec/keystone/sec_keystone_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,22 +30,21 @@ static int sec_keystone_component_register(void); */ mca_sec_keystone_component_t mca_sec_keystone_component = { { - { + .base_version = { OPAL_SEC_BASE_VERSION_1_0_0, /* Component name and version */ - "keystone", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "keystone", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - sec_keystone_component_open, - sec_keystone_component_close, - sec_keystone_component_query, - sec_keystone_component_register + .mca_open_component = sec_keystone_component_open, + .mca_close_component = sec_keystone_component_close, + .mca_query_component = sec_keystone_component_query, + .mca_register_component_params = sec_keystone_component_register, }, - { + .base_data ={ /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/sec/munge/sec_munge_component.c b/opal/mca/sec/munge/sec_munge_component.c index f29016b2ad..cf024b56b9 100644 --- a/opal/mca/sec/munge/sec_munge_component.c +++ b/opal/mca/sec/munge/sec_munge_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,22 +27,19 @@ static int sec_munge_component_close(void); * and pointers to our public functions in it */ opal_sec_base_component_t mca_sec_munge_component = { - { + .base_version = { OPAL_SEC_BASE_VERSION_1_0_0, /* Component name and version */ - "munge", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "munge", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, OPAL_RELEASE_VERSION), /* Component open and close functions */ - sec_munge_component_open, - sec_munge_component_close, - sec_munge_component_query, - NULL + .mca_open_component = sec_munge_component_open, + .mca_close_component = sec_munge_component_close, + .mca_query_component = sec_munge_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT } diff --git a/opal/mca/shmem/mmap/shmem_mmap_component.c b/opal/mca/shmem/mmap/shmem_mmap_component.c index f156bb8d4d..5906d6a735 100644 --- a/opal/mca/shmem/mmap/shmem_mmap_component.c +++ b/opal/mca/shmem/mmap/shmem_mmap_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,8 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2010-2011 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,9 +64,8 @@ opal_shmem_mmap_component_t mca_shmem_mmap_component = { /* component name and version */ .mca_component_name = "mmap", - .mca_component_major_version = OPAL_MAJOR_VERSION, - .mca_component_minor_version = OPAL_MINOR_VERSION, - .mca_component_release_version = OPAL_RELEASE_VERSION, + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), .mca_open_component = mmap_open, .mca_close_component = mmap_close, diff --git a/opal/mca/shmem/posix/shmem_posix_component.c b/opal/mca/shmem/posix/shmem_posix_component.c index feac90c3ca..7f78b9eb45 100644 --- a/opal/mca/shmem/posix/shmem_posix_component.c +++ b/opal/mca/shmem/posix/shmem_posix_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2010-2011 Los Alamos National Security, LLC. + * Copyright (c) 2010-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2011 NVIDIA Corporation. All rights reserved. * $COPYRIGHT$ @@ -76,9 +77,8 @@ opal_shmem_posix_component_t mca_shmem_posix_component = { /* component name and version */ .mca_component_name = "posix", - .mca_component_major_version = OPAL_MAJOR_VERSION, - .mca_component_minor_version = OPAL_MINOR_VERSION, - .mca_component_release_version = OPAL_RELEASE_VERSION, + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), .mca_open_component = posix_open, .mca_query_component = posix_query, diff --git a/opal/mca/shmem/sysv/shmem_sysv_component.c b/opal/mca/shmem/sysv/shmem_sysv_component.c index 323296c26e..6875c01259 100644 --- a/opal/mca/shmem/sysv/shmem_sysv_component.c +++ b/opal/mca/shmem/sysv/shmem_sysv_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,8 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2010-2011 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2011 NVIDIA Corporation. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. @@ -81,9 +82,8 @@ opal_shmem_sysv_component_t mca_shmem_sysv_component = { /* component name and version */ .mca_component_name = "sysv", - .mca_component_major_version = OPAL_MAJOR_VERSION, - .mca_component_minor_version = OPAL_MINOR_VERSION, - .mca_component_release_version = OPAL_RELEASE_VERSION, + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), .mca_open_component = sysv_open, .mca_query_component = sysv_query, diff --git a/opal/mca/timer/aix/timer_aix_component.c b/opal/mca/timer/aix/timer_aix_component.c index d7d83e1f1b..f8fd8be6c2 100644 --- a/opal/mca/timer/aix/timer_aix_component.c +++ b/opal/mca/timer/aix/timer_aix_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,20 +38,16 @@ static int opal_timer_aix_open(void); const opal_timer_base_component_2_0_0_t mca_timer_aix_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .timerc_version = { OPAL_TIMER_BASE_VERSION_2_0_0, - /* Component name and version */ - "aix", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "aix", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), - /* Component open and close functions */ - opal_timer_aix_open, - NULL + .mca_open_component = opal_timer_aix_open, }, - { + .timerc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/opal/mca/timer/altix/timer_altix_component.c b/opal/mca/timer/altix/timer_altix_component.c index 1eb4450355..f995300cc3 100644 --- a/opal/mca/timer/altix/timer_altix_component.c +++ b/opal/mca/timer/altix/timer_altix_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -45,20 +48,19 @@ static int opal_timer_altix_close(void); const opal_timer_base_component_2_0_0_t mca_timer_altix_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .timerc_version = { OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ - "altix", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "altix", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - opal_timer_altix_open, - opal_timer_altix_close + .mca_open_component = opal_timer_altix_open, + .mca_close_component = opal_timer_altix_close, }, - { + .timerc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/opal/mca/timer/darwin/timer_darwin_component.c b/opal/mca/timer/darwin/timer_darwin_component.c index 7529636f31..f8058b9479 100644 --- a/opal/mca/timer/darwin/timer_darwin_component.c +++ b/opal/mca/timer/darwin/timer_darwin_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Los Alamos National Security, LLC. All rights + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -33,20 +34,17 @@ static int opal_timer_darwin_open(void); const opal_timer_base_component_2_0_0_t mca_timer_darwin_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .timerc_version = { OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ - "darwin", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "darwin", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), - /* Component open and close functions */ - opal_timer_darwin_open, - NULL + .mca_open_component = opal_timer_darwin_open, }, - { + .timerc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/opal/mca/timer/linux/timer_linux_component.c b/opal/mca/timer/linux/timer_linux_component.c index e402e58495..b1308261d4 100644 --- a/opal/mca/timer/linux/timer_linux_component.c +++ b/opal/mca/timer/linux/timer_linux_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -49,20 +52,18 @@ static int opal_timer_linux_open(void); const opal_timer_base_component_2_0_0_t mca_timer_linux_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .timerc_version = { OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ - "linux", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, + .mca_component_name = "linux", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), /* Component open and close functions */ - opal_timer_linux_open, - NULL + .mca_open_component = opal_timer_linux_open, }, - { + .timerc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/opal/mca/timer/solaris/timer_solaris_component.c b/opal/mca/timer/solaris/timer_solaris_component.c index ba4fc7cf4a..d56dc89ce3 100644 --- a/opal/mca/timer/solaris/timer_solaris_component.c +++ b/opal/mca/timer/solaris/timer_solaris_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,20 +28,15 @@ const opal_timer_base_component_2_0_0_t mca_timer_solaris_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .timerc_version = { OPAL_TIMER_BASE_VERSION_2_0_0, /* Component name and version */ - "solaris", - OPAL_MAJOR_VERSION, - OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION, - - /* Component open and close functions */ - NULL, - NULL + .mca_component_name = "solaris", + MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION), }, - { + .timerc_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/dfs/app/dfs_app_component.c b/orte/mca/dfs/app/dfs_app_component.c index 648598c092..405288954e 100644 --- a/orte/mca/dfs/app/dfs_app_component.c +++ b/orte/mca/dfs/app/dfs_app_component.c @@ -1,5 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -39,20 +41,19 @@ orte_dfs_base_component_t mca_dfs_app_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_DFS_BASE_VERSION_1_0_0, /* Component name and version */ - "app", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "app", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - dfs_app_open, - dfs_app_close, - dfs_app_component_query + .mca_open_component = dfs_app_open, + .mca_close_component = dfs_app_close, + .mca_query_component = dfs_app_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/dfs/orted/dfs_orted_component.c b/orte/mca/dfs/orted/dfs_orted_component.c index 7260439c15..f9ac8b178c 100644 --- a/orte/mca/dfs/orted/dfs_orted_component.c +++ b/orte/mca/dfs/orted/dfs_orted_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -43,24 +44,23 @@ orte_dfs_base_component_t mca_dfs_orted_component = /* Handle the general mca_component_t struct containing * meta information about the component itdefault_orted */ - { + .base_version = { ORTE_DFS_BASE_VERSION_1_0_0, /* Component name and version */ - "orted", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "orted", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - dfs_orted_open, - dfs_orted_close, - dfs_orted_component_query, - dfs_orted_register + .mca_open_component = dfs_orted_open, + .mca_close_component = dfs_orted_close, + .mca_query_component = dfs_orted_component_query, + .mca_register_component_params = dfs_orted_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int dfs_orted_register(void) diff --git a/orte/mca/dfs/test/dfs_test_component.c b/orte/mca/dfs/test/dfs_test_component.c index eda1b4110c..fda025e504 100644 --- a/orte/mca/dfs/test/dfs_test_component.c +++ b/orte/mca/dfs/test/dfs_test_component.c @@ -1,5 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -40,21 +42,20 @@ orte_dfs_base_component_t mca_dfs_test_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_DFS_BASE_VERSION_1_0_0, /* Component name and version */ - "test", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "test", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - dfs_test_open, - dfs_test_close, - dfs_test_component_query, - dfs_test_register + .mca_open_component = dfs_test_open, + .mca_close_component = dfs_test_close, + .mca_query_component = dfs_test_component_query, + .mca_register_component_params = dfs_test_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/errmgr/default_app/errmgr_default_app_component.c b/orte/mca/errmgr/default_app/errmgr_default_app_component.c index 33665c5093..c56fbbf293 100644 --- a/orte/mca/errmgr/default_app/errmgr_default_app_component.c +++ b/orte/mca/errmgr/default_app/errmgr_default_app_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -38,21 +41,20 @@ orte_errmgr_base_component_t mca_errmgr_default_app_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_ERRMGR_BASE_VERSION_3_0_0, /* Component name and version */ - "default_app", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "default_app", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - errmgr_default_app_open, - errmgr_default_app_close, - errmgr_default_app_component_query, - errmgr_default_app_register + .mca_open_component = errmgr_default_app_open, + .mca_close_component = errmgr_default_app_close, + .mca_query_component = errmgr_default_app_component_query, + .mca_register_component_params = errmgr_default_app_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/errmgr/default_hnp/errmgr_default_hnp_component.c b/orte/mca/errmgr/default_hnp/errmgr_default_hnp_component.c index 50d3054844..b2a725e384 100644 --- a/orte/mca/errmgr/default_hnp/errmgr_default_hnp_component.c +++ b/orte/mca/errmgr/default_hnp/errmgr_default_hnp_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -38,21 +41,20 @@ orte_errmgr_base_component_t mca_errmgr_default_hnp_component = { /* Handle the general mca_component_t struct containing * meta information about the component default_hnp */ - { + .base_version = { ORTE_ERRMGR_BASE_VERSION_3_0_0, /* Component name and version */ - "default_hnp", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "default_hnp", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - default_hnp_open, - default_hnp_close, - default_hnp_component_query, - default_hnp_register + .mca_open_component = default_hnp_open, + .mca_close_component = default_hnp_close, + .mca_query_component = default_hnp_component_query, + .mca_register_component_params = default_hnp_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/errmgr/default_orted/errmgr_default_orted_component.c b/orte/mca/errmgr/default_orted/errmgr_default_orted_component.c index 0e1ee4ce65..3ed11d8c46 100644 --- a/orte/mca/errmgr/default_orted/errmgr_default_orted_component.c +++ b/orte/mca/errmgr/default_orted/errmgr_default_orted_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -38,24 +41,23 @@ orte_errmgr_base_component_t mca_errmgr_default_orted_component = /* Handle the general mca_component_t struct containing * meta information about the component itdefault_orted */ - { + .base_version = { ORTE_ERRMGR_BASE_VERSION_3_0_0, /* Component name and version */ - "default_orted", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "default_orted", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - errmgr_default_orted_open, - errmgr_default_orted_close, - errmgr_default_orted_component_query, - errmgr_default_orted_register + .mca_open_component = errmgr_default_orted_open, + .mca_close_component = errmgr_default_orted_close, + .mca_query_component = errmgr_default_orted_component_query, + .mca_register_component_params = errmgr_default_orted_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int my_priority; diff --git a/orte/mca/errmgr/default_tool/errmgr_default_tool_component.c b/orte/mca/errmgr/default_tool/errmgr_default_tool_component.c index 678bd723ad..58ca229e08 100644 --- a/orte/mca/errmgr/default_tool/errmgr_default_tool_component.c +++ b/orte/mca/errmgr/default_tool/errmgr_default_tool_component.c @@ -38,21 +38,20 @@ orte_errmgr_base_component_t mca_errmgr_default_tool_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_ERRMGR_BASE_VERSION_3_0_0, /* Component name and version */ - "default_tool", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "default_tool", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - errmgr_default_tool_open, - errmgr_default_tool_close, - errmgr_default_tool_component_query, - errmgr_default_tool_register + .mca_open_component = errmgr_default_tool_open, + .mca_close_component = errmgr_default_tool_close, + .mca_query_component = errmgr_default_tool_component_query, + .mca_register_component_params = errmgr_default_tool_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/ess/alps/ess_alps_component.c b/orte/mca/ess/alps/ess_alps_component.c index 830f532776..c09ff233ea 100644 --- a/orte/mca/ess/alps/ess_alps_component.c +++ b/orte/mca/ess/alps/ess_alps_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2011-2012 Los Alamos National Security, LLC. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. * All rights reserved. * $COPYRIGHT$ * @@ -43,24 +44,23 @@ orte_ess_base_component_t mca_ess_alps_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "alps", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "alps", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ess_alps_component_open, - orte_ess_alps_component_close, - orte_ess_alps_component_query + .mca_open_component = orte_ess_alps_component_open, + .mca_close_component = orte_ess_alps_component_close, + .mca_query_component = orte_ess_alps_component_query, }, - { + .base_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE - } + }, }; int diff --git a/orte/mca/ess/env/ess_env_component.c b/orte/mca/ess/env/ess_env_component.c index 3dc05c6b36..3b6f8ddd7a 100644 --- a/orte/mca/ess/env/ess_env_component.c +++ b/orte/mca/ess/env/ess_env_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -37,24 +40,23 @@ extern orte_ess_base_module_t orte_ess_env_module; * and pointers to our public functions in it */ orte_ess_base_component_t mca_ess_env_component = { - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "env", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "env", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ess_env_component_open, - orte_ess_env_component_close, - orte_ess_env_component_query + .mca_open_component = orte_ess_env_component_open, + .mca_close_component = orte_ess_env_component_close, + .mca_query_component = orte_ess_env_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/ess/hnp/ess_hnp_component.c b/orte/mca/ess/hnp/ess_hnp_component.c index 17fb8c0387..be5d192289 100644 --- a/orte/mca/ess/hnp/ess_hnp_component.c +++ b/orte/mca/ess/hnp/ess_hnp_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -37,24 +40,23 @@ extern orte_ess_base_module_t orte_ess_hnp_module; * and pointers to our public functions in it */ orte_ess_base_component_t mca_ess_hnp_component = { - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "hnp", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "hnp", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ess_hnp_component_open, - orte_ess_hnp_component_close, - orte_ess_hnp_component_query + .mca_open_component = orte_ess_hnp_component_open, + .mca_close_component = orte_ess_hnp_component_close, + .mca_query_component = orte_ess_hnp_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/ess/lsf/ess_lsf_component.c b/orte/mca/ess/lsf/ess_lsf_component.c index ad4ca47705..e8dbe517db 100644 --- a/orte/mca/ess/lsf/ess_lsf_component.c +++ b/orte/mca/ess/lsf/ess_lsf_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -34,24 +37,23 @@ extern orte_ess_base_module_t orte_ess_lsf_module; * and pointers to our public functions in it */ orte_ess_base_component_t mca_ess_lsf_component = { - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "lsf", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "lsf", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ess_lsf_component_open, - orte_ess_lsf_component_close, - orte_ess_lsf_component_query + .mca_open_component = orte_ess_lsf_component_open, + .mca_close_component = orte_ess_lsf_component_close, + .mca_query_component = orte_ess_lsf_component_query, }, - { + .base_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE - } + }, }; diff --git a/orte/mca/ess/pmi/ess_pmi_component.c b/orte/mca/ess/pmi/ess_pmi_component.c index 05199eddce..2864c9de2b 100644 --- a/orte/mca/ess/pmi/ess_pmi_component.c +++ b/orte/mca/ess/pmi/ess_pmi_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All * rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ @@ -40,24 +41,23 @@ static int pmi_component_query(mca_base_module_t **module, int *priority); * and pointers to our public functions in it */ orte_ess_base_component_t mca_ess_pmi_component = { - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "pmi", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "pmi", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - pmi_component_open, - pmi_component_close, - pmi_component_query + .mca_open_component = pmi_component_open, + .mca_close_component = pmi_component_close, + .mca_query_component = pmi_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int pmi_component_open(void) diff --git a/orte/mca/ess/singleton/ess_singleton_component.c b/orte/mca/ess/singleton/ess_singleton_component.c index da758d795f..1f82b4b443 100644 --- a/orte/mca/ess/singleton/ess_singleton_component.c +++ b/orte/mca/ess/singleton/ess_singleton_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -48,25 +51,24 @@ orte_ess_singleton_component_register(void); orte_ess_base_component_t mca_ess_singleton_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "singleton", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "singleton", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ess_singleton_component_open, - orte_ess_singleton_component_close, - orte_ess_singleton_component_query, - orte_ess_singleton_component_register + .mca_open_component = orte_ess_singleton_component_open, + .mca_close_component = orte_ess_singleton_component_close, + .mca_query_component = orte_ess_singleton_component_query, + .mca_register_component_params = orte_ess_singleton_component_register, }, - { + .base_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE - } + }, }; static int diff --git a/orte/mca/ess/slurm/ess_slurm_component.c b/orte/mca/ess/slurm/ess_slurm_component.c index be2a4d8b42..9790daa3f0 100644 --- a/orte/mca/ess/slurm/ess_slurm_component.c +++ b/orte/mca/ess/slurm/ess_slurm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -37,24 +40,23 @@ extern orte_ess_base_module_t orte_ess_slurm_module; * and pointers to our public functions in it */ orte_ess_base_component_t mca_ess_slurm_component = { - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "slurm", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "slurm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ess_slurm_component_open, - orte_ess_slurm_component_close, - orte_ess_slurm_component_query + .mca_open_component = orte_ess_slurm_component_open, + .mca_close_component = orte_ess_slurm_component_close, + .mca_query_component = orte_ess_slurm_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/ess/tm/ess_tm_component.c b/orte/mca/ess/tm/ess_tm_component.c index fb3cc76628..fd2fa5eaed 100644 --- a/orte/mca/ess/tm/ess_tm_component.c +++ b/orte/mca/ess/tm/ess_tm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -37,24 +40,23 @@ extern orte_ess_base_module_t orte_ess_tm_module; * and pointers to our public functions in it */ orte_ess_base_component_t mca_ess_tm_component = { - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "tm", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "tm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ess_tm_component_open, - orte_ess_tm_component_close, - orte_ess_tm_component_query + .mca_open_component = orte_ess_tm_component_open, + .mca_close_component = orte_ess_tm_component_close, + .mca_query_component = orte_ess_tm_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/ess/tool/ess_tool_component.c b/orte/mca/ess/tool/ess_tool_component.c index dd2e26b39f..19ae6c6dfb 100644 --- a/orte/mca/ess/tool/ess_tool_component.c +++ b/orte/mca/ess/tool/ess_tool_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -37,24 +40,23 @@ extern orte_ess_base_module_t orte_ess_tool_module; * and pointers to our public functions in it */ orte_ess_base_component_t mca_ess_tool_component = { - { + .base_version = { ORTE_ESS_BASE_VERSION_3_0_0, /* Component name and version */ - "tool", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "tool", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ess_tool_component_open, - orte_ess_tool_component_close, - orte_ess_tool_component_query + .mca_open_component = orte_ess_tool_component_open, + .mca_close_component = orte_ess_tool_component_close, + .mca_query_component = orte_ess_tool_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/filem/raw/filem_raw_component.c b/orte/mca/filem/raw/filem_raw_component.c index ae3a387569..17fdf72774 100644 --- a/orte/mca/filem/raw/filem_raw_component.c +++ b/orte/mca/filem/raw/filem_raw_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,21 +36,20 @@ static int filem_raw_query(mca_base_module_t **module, int *priority); bool orte_filem_raw_flatten_trees=false; orte_filem_base_component_t mca_filem_raw_component = { - { + .base_version = { ORTE_FILEM_BASE_VERSION_2_0_0, /* Component name and version */ - "raw", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "raw", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - filem_raw_open, - filem_raw_close, - filem_raw_query, - filem_raw_register + .mca_open_component = filem_raw_open, + .mca_close_component = filem_raw_close, + .mca_query_component = filem_raw_query, + .mca_register_component_params = filem_raw_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/grpcomm/brks/grpcomm_brks_component.c b/orte/mca/grpcomm/brks/grpcomm_brks_component.c index 918f338215..5407229ecd 100644 --- a/orte/mca/grpcomm/brks/grpcomm_brks_component.c +++ b/orte/mca/grpcomm/brks/grpcomm_brks_component.c @@ -1,8 +1,8 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All - * rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -31,22 +31,21 @@ static int brks_register(void); * Struct of function pointers that need to be initialized */ orte_grpcomm_base_component_t mca_grpcomm_brks_component = { - { + .base_version = { ORTE_GRPCOMM_BASE_VERSION_3_0_0, - "brks", /* MCA module name */ - ORTE_MAJOR_VERSION, /* MCA module major version */ - ORTE_MINOR_VERSION, /* MCA module minor version */ - ORTE_RELEASE_VERSION, /* MCA module release version */ - brks_open, /* component open */ - brks_close, /* component close */ - brks_query, /* component query */ - brks_register + .mca_component_name = "brks", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = brks_open, + .mca_close_component = brks_close, + .mca_query_component = brks_query, + .mca_register_component_params = brks_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int brks_register(void) diff --git a/orte/mca/grpcomm/direct/grpcomm_direct_component.c b/orte/mca/grpcomm/direct/grpcomm_direct_component.c index eb8f563c53..ac4b6e693f 100644 --- a/orte/mca/grpcomm/direct/grpcomm_direct_component.c +++ b/orte/mca/grpcomm/direct/grpcomm_direct_component.c @@ -1,8 +1,8 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All - * rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -31,22 +31,21 @@ static int direct_register(void); * Struct of function pointers that need to be initialized */ orte_grpcomm_base_component_t mca_grpcomm_direct_component = { - { + .base_version = { ORTE_GRPCOMM_BASE_VERSION_3_0_0, - "direct", /* MCA module name */ - ORTE_MAJOR_VERSION, /* MCA module major version */ - ORTE_MINOR_VERSION, /* MCA module minor version */ - ORTE_RELEASE_VERSION, /* MCA module release version */ - direct_open, /* component open */ - direct_close, /* component close */ - direct_query, /* component query */ - direct_register + .mca_component_name = "direct", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = direct_open, + .mca_close_component = direct_close, + .mca_query_component = direct_query, + .mca_register_component_params = direct_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int direct_register(void) diff --git a/orte/mca/grpcomm/rcd/grpcomm_rcd_component.c b/orte/mca/grpcomm/rcd/grpcomm_rcd_component.c index 32f3d96504..b71557877d 100644 --- a/orte/mca/grpcomm/rcd/grpcomm_rcd_component.c +++ b/orte/mca/grpcomm/rcd/grpcomm_rcd_component.c @@ -1,8 +1,8 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All - * rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -31,22 +31,21 @@ static int rcd_register(void); * Struct of function pointers that need to be initialized */ orte_grpcomm_base_component_t mca_grpcomm_rcd_component = { - { + .base_version = { ORTE_GRPCOMM_BASE_VERSION_3_0_0, - "rcd", /* MCA module name */ - ORTE_MAJOR_VERSION, /* MCA module major version */ - ORTE_MINOR_VERSION, /* MCA module minor version */ - ORTE_RELEASE_VERSION, /* MCA module release version */ - rcd_open, /* component open */ - rcd_close, /* component close */ - rcd_query, /* component query */ - rcd_register + .mca_component_name = "rcd", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = rcd_open, + .mca_close_component = rcd_close, + .mca_query_component = rcd_query, + .mca_register_component_params = rcd_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int rcd_register(void) diff --git a/orte/mca/iof/hnp/iof_hnp_component.c b/orte/mca/iof/hnp/iof_hnp_component.c index f0b530d536..71f4592200 100644 --- a/orte/mca/iof/hnp/iof_hnp_component.c +++ b/orte/mca/iof/hnp/iof_hnp_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -46,24 +49,22 @@ orte_iof_hnp_component_t mca_iof_hnp_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .iof_version = { ORTE_IOF_BASE_VERSION_2_0_0, - - "hnp", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - + + .mca_component_name = "hnp", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open, close, and query functions */ - orte_iof_hnp_open, - orte_iof_hnp_close, - orte_iof_hnp_query + .mca_open_component = orte_iof_hnp_open, + .mca_close_component = orte_iof_hnp_close, + .mca_query_component = orte_iof_hnp_query, }, - { + .iof_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - } }; diff --git a/orte/mca/iof/mr_hnp/iof_mrhnp_component.c b/orte/mca/iof/mr_hnp/iof_mrhnp_component.c index 3a1affd379..e0d2335e44 100644 --- a/orte/mca/iof/mr_hnp/iof_mrhnp_component.c +++ b/orte/mca/iof/mr_hnp/iof_mrhnp_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -35,26 +36,24 @@ const char *mca_iof_mr_hnp_component_version_string = orte_iof_mrhnp_component_t mca_iof_mr_hnp_component = { { /* First, the mca_base_component_t struct containing meta - information about the component itself */ + information about the component itself */ - { + .iof_version = { ORTE_IOF_BASE_VERSION_2_0_0, - - "mr_hnp", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - + + .mca_component_name = "mr_hnp", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open, close, and query functions */ - mrhnp_open, - mrhnp_close, - mrhnp_query + .mca_open_component = mrhnp_open, + .mca_close_component = mrhnp_close, + .mca_query_component = mrhnp_query, }, - { + .iof_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - } }; diff --git a/orte/mca/iof/mr_orted/iof_mrorted_component.c b/orte/mca/iof/mr_orted/iof_mrorted_component.c index 135cc8f857..41ce83d9f6 100644 --- a/orte/mca/iof/mr_orted/iof_mrorted_component.c +++ b/orte/mca/iof/mr_orted/iof_mrorted_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -34,23 +35,22 @@ const char *mca_iof_mr_orted_component_version_string = orte_iof_mrorted_component_t mca_iof_mr_orted_component = { { - { + .iof_version = { ORTE_IOF_BASE_VERSION_2_0_0, - - "mr_orted", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - + + .mca_component_name = "mr_orted", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open, close, and query functions */ - mr_orted_open, - mr_orted_close, - mr_orted_query + .mca_open_component = mr_orted_open, + .mca_close_component = mr_orted_close, + .mca_query_component = mr_orted_query, }, - { + .iof_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/iof/orted/iof_orted_component.c b/orte/mca/iof/orted/iof_orted_component.c index 9a88a1a73a..9cf9bde989 100644 --- a/orte/mca/iof/orted/iof_orted_component.c +++ b/orte/mca/iof/orted/iof_orted_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -42,23 +45,22 @@ const char *mca_iof_orted_component_version_string = orte_iof_orted_component_t mca_iof_orted_component = { { - { + .iof_version = { ORTE_IOF_BASE_VERSION_2_0_0, - - "orted", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - + + .mca_component_name = "orted", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open, close, and query functions */ - orte_iof_orted_open, - orte_iof_orted_close, - orte_iof_orted_query + .mca_open_component = orte_iof_orted_open, + .mca_close_component = orte_iof_orted_close, + .mca_query_component = orte_iof_orted_query, }, - { + .iof_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/iof/tool/iof_tool_component.c b/orte/mca/iof/tool/iof_tool_component.c index cf33d5e654..73a26376e0 100644 --- a/orte/mca/iof/tool/iof_tool_component.c +++ b/orte/mca/iof/tool/iof_tool_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -46,23 +49,22 @@ const char *mca_iof_tool_component_version_string = orte_iof_tool_component_t mca_iof_tool_component = { { - { + .iof_version = { ORTE_IOF_BASE_VERSION_2_0_0, - "tool", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - + .mca_component_name = "tool", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open, close, and query functions */ - orte_iof_tool_open, - orte_iof_tool_close, - orte_iof_tool_query + .mca_open_component = orte_iof_tool_open, + .mca_close_component = orte_iof_tool_close, + .mca_query_component = orte_iof_tool_query, }, - { + .iof_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/notifier/smtp/notifier_smtp_component.c b/orte/mca/notifier/smtp/notifier_smtp_component.c index e016b2d9a0..6a021847d1 100644 --- a/orte/mca/notifier/smtp/notifier_smtp_component.c +++ b/orte/mca/notifier/smtp/notifier_smtp_component.c @@ -1,5 +1,5 @@ -/* -*- C -*- - * +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -41,24 +43,21 @@ static int smtp_register(void); */ orte_notifier_smtp_component_t mca_notifier_smtp_component = { { - { + .base_version = { ORTE_NOTIFIER_BASE_VERSION_1_0_0, - - "smtp", - - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - - NULL, - smtp_close, - smtp_component_query, - smtp_register, + + .mca_component_name = "smtp", + + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_close_component = smtp_close, + .mca_query_component = smtp_component_query, + .mca_register_component_params = smtp_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }, }; diff --git a/orte/mca/notifier/syslog/notifier_syslog_component.c b/orte/mca/notifier/syslog/notifier_syslog_component.c index 93aca08202..5b52c3493c 100644 --- a/orte/mca/notifier/syslog/notifier_syslog_component.c +++ b/orte/mca/notifier/syslog/notifier_syslog_component.c @@ -1,5 +1,5 @@ -/* -*- C -*- - * +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,21 +37,18 @@ static int orte_notifier_syslog_component_query(mca_base_module_t **module, * Struct of function pointers that need to be initialized */ orte_notifier_base_component_t mca_notifier_syslog_component = { - { + .base_version = { ORTE_NOTIFIER_BASE_VERSION_1_0_0, - - "syslog", /* MCA module name */ - ORTE_MAJOR_VERSION, /* MCA module major version */ - ORTE_MINOR_VERSION, /* MCA module minor version */ - ORTE_RELEASE_VERSION, /* MCA module release version */ - NULL, - NULL, - orte_notifier_syslog_component_query /* module query */ + + .mca_component_name = "syslog", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = orte_notifier_syslog_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int orte_notifier_syslog_component_query(mca_base_module_t **module, diff --git a/orte/mca/odls/alps/odls_alps_component.c b/orte/mca/odls/alps/odls_alps_component.c index 24bacf6091..ee187c9704 100644 --- a/orte/mca/odls/alps/odls_alps_component.c +++ b/orte/mca/odls/alps/odls_alps_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2014 Los Alamos National Security, LLC. All rights + * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -50,23 +51,22 @@ orte_odls_base_component_t mca_odls_alps_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .version = { ORTE_ODLS_BASE_VERSION_2_0_0, /* Component name and version */ - "alps", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "alps", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_odls_alps_component_open, - orte_odls_alps_component_close, - orte_odls_alps_component_query, + .mca_open_component = orte_odls_alps_component_open, + .mca_close_component = orte_odls_alps_component_close, + .mca_query_component = orte_odls_alps_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/odls/default/odls_default_component.c b/orte/mca/odls/default/odls_default_component.c index cc2a88c075..e695101e38 100644 --- a/orte/mca/odls/default/odls_default_component.c +++ b/orte/mca/odls/default/odls_default_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -46,23 +49,22 @@ orte_odls_base_component_t mca_odls_default_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .version = { ORTE_ODLS_BASE_VERSION_2_0_0, /* Component name and version */ - "default", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "default", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_odls_default_component_open, - orte_odls_default_component_close, - orte_odls_default_component_query, + .mca_open_component = orte_odls_default_component_open, + .mca_close_component = orte_odls_default_component_close, + .mca_query_component = orte_odls_default_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/oob/alps/oob_alps_component.c b/orte/mca/oob/alps/oob_alps_component.c index 327ce5f48c..9432bc43bf 100644 --- a/orte/mca/oob/alps/oob_alps_component.c +++ b/orte/mca/oob/alps/oob_alps_component.c @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2014 Los Alamos National Security, LLC. + * Copyright (c) 2006-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. @@ -90,33 +90,28 @@ static int component_ft_event(int state); * Struct of function pointers and all that to let us be initialized */ mca_oob_base_component_t mca_oob_alps_component = { - { - MCA_OOB_BASE_VERSION_2_0_0, - "alps", /* MCA module name */ - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - alps_component_open, /* component open */ - alps_component_close, /* component close */ - NULL, /* component query */ - alps_component_register, /* component register */ - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, - 0, // reserve space for an assigned index - 30, // default priority of this transport - component_available, - component_startup, - component_shutdown, - component_send, - component_get_addr, - component_set_addr, - component_is_reachable + .oob_base = { + MCA_OOB_BASE_VERSION_2_0_0, + .mca_component_name = "alps", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = alps_component_open, + .mca_close_component = alps_component_close, + }, + .oob_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, + .priority = 30, // default priority of this transport + .available = component_available, + .startup = component_startup, + .shutdown = component_shutdown, + .send_nb = component_send, + .get_addr = component_get_addr, + .set_addr = component_set_addr, + .is_reachable = component_is_reachable, #if OPAL_ENABLE_FT_CR == 1 - , - component_ft_event + .ft_event = component_ft_event, #endif }; @@ -133,11 +128,6 @@ static int alps_component_close(void) return ORTE_SUCCESS; } -static int alps_component_register(void) -{ - return ORTE_SUCCESS; -} - static bool component_available(void) { int rc; diff --git a/orte/mca/oob/tcp/oob_tcp_component.c b/orte/mca/oob/tcp/oob_tcp_component.c index 07c9c245d6..4bf063465e 100644 --- a/orte/mca/oob/tcp/oob_tcp_component.c +++ b/orte/mca/oob/tcp/oob_tcp_component.c @@ -10,8 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2014 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2006-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2013-2014 Intel, Inc. All rights reserved. @@ -100,33 +100,29 @@ static int component_ft_event(int state); */ mca_oob_tcp_component_t mca_oob_tcp_component = { { - { + .oob_base = { MCA_OOB_BASE_VERSION_2_0_0, - "tcp", /* MCA module name */ - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - tcp_component_open, /* component open */ - tcp_component_close, /* component close */ - NULL, /* component query */ - tcp_component_register, /* component register */ + .mca_component_name = "tcp", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = tcp_component_open, + .mca_close_component = tcp_component_close, + .mca_register_component_params = tcp_component_register, }, - { + .oob_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - 0, // reserve space for an assigned index - 30, // default priority of this transport - component_available, - component_startup, - component_shutdown, - component_send, - component_get_addr, - component_set_addr, - component_is_reachable + .priority = 30, // default priority of this transport + .available = component_available, + .startup = component_startup, + .shutdown = component_shutdown, + .send_nb = component_send, + .get_addr = component_get_addr, + .set_addr = component_set_addr, + .is_reachable = component_is_reachable, #if OPAL_ENABLE_FT_CR == 1 - , - component_ft_event + .ft_event = component_ft_event, #endif }, }; diff --git a/orte/mca/oob/ud/oob_ud_component.c b/orte/mca/oob/ud/oob_ud_component.c index 91a7559953..89ad686320 100644 --- a/orte/mca/oob/ud/oob_ud_component.c +++ b/orte/mca/oob/ud/oob_ud_component.c @@ -59,32 +59,29 @@ static void mca_oob_ud_device_destruct (mca_oob_ud_device_t *device); */ mca_oob_ud_component_t mca_oob_ud_component = { { - { + .oob_base = { MCA_OOB_BASE_VERSION_2_0_0, - "ud", /* MCA module name */ - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - mca_oob_ud_component_open, /* component open */ - mca_oob_ud_component_close, /* component close */ - NULL, /* component query */ - mca_oob_ud_component_register, /* component register */ + .mca_component_name = "ud", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = mca_oob_ud_component_open, + .mca_close_component = mca_oob_ud_component_close, + .mca_register_component_params = mca_oob_ud_component_register, }, - { + .oob_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - 0, // reserve space for an assigned index - 0, //set the priority so that we will select this component only if someone directs to do so - mca_oob_ud_component_available, //available - mca_oob_ud_component_startup, //startup - mca_oob_ud_component_shutdown, //shutdown - mca_oob_ud_component_send_nb, //send_nb - mca_oob_ud_component_get_addr, - mca_oob_ud_component_set_addr, - mca_oob_ud_component_is_reachable, //is_reachable + .priority = 0, //set the priority so that we will select this component only if someone directs to do so + .available = mca_oob_ud_component_available, //available + .startup = mca_oob_ud_component_startup, //startup + .shutdown = mca_oob_ud_component_shutdown, //shutdown + .send_nb = mca_oob_ud_component_send_nb, //send_nb + .get_addr = mca_oob_ud_component_get_addr, + .set_addr = mca_oob_ud_component_set_addr, + .is_reachable = mca_oob_ud_component_is_reachable, //is_reachable #if OPAL_ENABLE_FT_CR == 1 - mca_oob_ud_component_ft_event, + .ft_event = mca_oob_ud_component_ft_event, #endif // OPAL_ENABLE_FT_CR }, }; diff --git a/orte/mca/oob/usock/oob_usock_component.c b/orte/mca/oob/usock/oob_usock_component.c index 0e1949ca31..67e0437d86 100644 --- a/orte/mca/oob/usock/oob_usock_component.c +++ b/orte/mca/oob/usock/oob_usock_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2013 Los Alamos National Security, LLC. + * Copyright (c) 2006-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. @@ -96,30 +97,27 @@ static bool component_is_reachable(orte_process_name_t *peer); */ mca_oob_usock_component_t mca_oob_usock_component = { { - { + .oob_base = { MCA_OOB_BASE_VERSION_2_0_0, - "usock", /* MCA module name */ - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - usock_component_open, /* component open */ - usock_component_close, /* component close */ - NULL, /* component query */ - usock_component_register, /* component register */ + .mca_component_name = "usock", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = usock_component_open, + .mca_close_component = usock_component_close, + .mca_register_component_params = usock_component_register, }, - { + .oob_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - 0, // reserve space for an assigned index - 100, // default priority of this transport - component_available, - component_startup, - component_shutdown, - component_send, - component_get_addr, - component_set_addr, - component_is_reachable + .priority = 100, + .available = component_available, + .startup = component_startup, + .shutdown = component_shutdown, + .send_nb = component_send, + .get_addr = component_get_addr, + .set_addr = component_set_addr, + .is_reachable = component_is_reachable, }, }; diff --git a/orte/mca/plm/alps/plm_alps_component.c b/orte/mca/plm/alps/plm_alps_component.c index 3d4f6b7d4f..23c0e6ca41 100644 --- a/orte/mca/plm/alps/plm_alps_component.c +++ b/orte/mca/plm/alps/plm_alps_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,25 +65,24 @@ orte_plm_alps_component_t mca_plm_alps_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "alps", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "alps", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - plm_alps_open, - plm_alps_close, - orte_plm_alps_component_query, - plm_alps_register + .mca_open_component = plm_alps_open, + .mca_close_component = plm_alps_close, + .mca_query_component = orte_plm_alps_component_query, + .mca_register_component_params = plm_alps_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } /* Other orte_plm_alps_component_t items -- left uninitialized diff --git a/orte/mca/plm/isolated/plm_isolated_component.c b/orte/mca/plm/isolated/plm_isolated_component.c index c277bcbc90..ae5aa7cd58 100644 --- a/orte/mca/plm/isolated/plm_isolated_component.c +++ b/orte/mca/plm/isolated/plm_isolated_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007-2011 Los Alamos National Security, LLC. All rights + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights @@ -61,25 +62,23 @@ static int isolated_component_close(void); */ orte_plm_base_component_t mca_plm_isolated_component = { - { + .base_version = { ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "isolated", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "isolated", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - isolated_component_open, - isolated_component_close, - isolated_component_query, - NULL + .mca_open_component = isolated_component_open, + .mca_close_component = isolated_component_close, + .mca_query_component = isolated_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int isolated_component_open(void) diff --git a/orte/mca/plm/lsf/plm_lsf_component.c b/orte/mca/plm/lsf/plm_lsf_component.c index 7467b6e708..f249564702 100644 --- a/orte/mca/plm/lsf/plm_lsf_component.c +++ b/orte/mca/plm/lsf/plm_lsf_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -12,6 +13,8 @@ * Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008 Institut National de Recherche en Informatique * et Automatique. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -65,24 +68,23 @@ orte_plm_lsf_component_t mca_plm_lsf_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "lsf", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "lsf", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - plm_lsf_open, - plm_lsf_close, - orte_plm_lsf_component_query + .mca_open_component = plm_lsf_open, + .mca_close_component = plm_lsf_close, + .mca_query_component = orte_plm_lsf_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/plm/rsh/plm_rsh_component.c b/orte/mca/plm/rsh/plm_rsh_component.c index 09d711bfcd..1b7fb44fc6 100644 --- a/orte/mca/plm/rsh/plm_rsh_component.c +++ b/orte/mca/plm/rsh/plm_rsh_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007-2011 Los Alamos National Security, LLC. All rights + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights @@ -78,25 +79,24 @@ orte_plm_rsh_component_t mca_plm_rsh_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { - ORTE_PLM_BASE_VERSION_2_0_0, + .base_version = { + ORTE_PLM_BASE_VERSION_2_0_0, - /* Component name and version */ - "rsh", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + /* Component name and version */ + .mca_component_name = "rsh", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), - /* Component open and close functions */ - rsh_component_open, - rsh_component_close, - rsh_component_query, - rsh_component_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - } + /* Component open and close functions */ + .mca_open_component = rsh_component_open, + .mca_close_component = rsh_component_close, + .mca_query_component = rsh_component_query, + .mca_register_component_params = rsh_component_register, + }, + .base_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, } }; diff --git a/orte/mca/plm/slurm/plm_slurm_component.c b/orte/mca/plm/slurm/plm_slurm_component.c index 4c623b4158..799a1c10ff 100644 --- a/orte/mca/plm/slurm/plm_slurm_component.c +++ b/orte/mca/plm/slurm/plm_slurm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -60,25 +63,24 @@ orte_plm_slurm_component_t mca_plm_slurm_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "slurm", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "slurm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - plm_slurm_open, - plm_slurm_close, - orte_plm_slurm_component_query, - plm_slurm_register + .mca_open_component = plm_slurm_open, + .mca_close_component = plm_slurm_close, + .mca_query_component = orte_plm_slurm_component_query, + .mca_register_component_params = plm_slurm_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } /* Other orte_plm_slurm_component_t items -- left uninitialized diff --git a/orte/mca/plm/tm/plm_tm_component.c b/orte/mca/plm/tm/plm_tm_component.c index d7d1a6681f..ebc3b3c56d 100644 --- a/orte/mca/plm/tm/plm_tm_component.c +++ b/orte/mca/plm/tm/plm_tm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -62,25 +65,24 @@ orte_plm_tm_component_t mca_plm_tm_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_PLM_BASE_VERSION_2_0_0, /* Component name and version */ - "tm", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "tm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - plm_tm_open, - plm_tm_close, - orte_plm_tm_component_query, - plm_tm_register + .mca_open_component = plm_tm_open, + .mca_close_component = plm_tm_close, + .mca_query_component = orte_plm_tm_component_query, + .mca_register_component_params = plm_tm_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/ras/alps/ras_alps_component.c b/orte/mca/ras/alps/ras_alps_component.c index 632516fa19..bccc763afa 100644 --- a/orte/mca/ras/alps/ras_alps_component.c +++ b/orte/mca/ras/alps/ras_alps_component.c @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 UT-Battelle, LLC - * Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ * @@ -46,25 +46,23 @@ orte_ras_base_component_t mca_ras_alps_component = { /* First, the mca_base_component_t struct containing meta information about * the component itself * */ - { + .base_version = { ORTE_RAS_BASE_VERSION_2_0_0, /* Component name and version */ - "alps", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "alps", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - ras_alps_open, - NULL, - orte_ras_alps_component_query, - ras_alps_register + .mca_open_component = ras_alps_open, + .mca_query_component = orte_ras_alps_component_query, + .mca_register_component_params = ras_alps_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; /* simple function used to strip off characters on and after a period. NULL diff --git a/orte/mca/ras/gridengine/ras_gridengine_component.c b/orte/mca/ras/gridengine/ras_gridengine_component.c index 428e2752b2..4f74370b0b 100644 --- a/orte/mca/ras/gridengine/ras_gridengine_component.c +++ b/orte/mca/ras/gridengine/ras_gridengine_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -47,24 +50,23 @@ static int orte_ras_gridengine_verbose; orte_ras_gridengine_component_t mca_ras_gridengine_component = { { - /* First, the mca_base_component_t struct containing meta - information about the component itself */ + /* First, the mca_base_component_t struct containing meta + information about the component itself */ - { - ORTE_RAS_BASE_VERSION_2_0_0, - "gridengine", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_ras_gridengine_open, /* component open */ - orte_ras_gridengine_close, /* component close */ - orte_ras_gridengine_component_query, - orte_ras_gridengine_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - } + .base_version = { + ORTE_RAS_BASE_VERSION_2_0_0, + .mca_component_name = "gridengine", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_ras_gridengine_open, + .mca_close_component = orte_ras_gridengine_close, + .mca_query_component = orte_ras_gridengine_component_query, + .mca_register_component_params = orte_ras_gridengine_register, + }, + .base_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, } }; diff --git a/orte/mca/ras/loadleveler/ras_loadleveler_component.c b/orte/mca/ras/loadleveler/ras_loadleveler_component.c index 754dedeaf8..1c141a97a7 100644 --- a/orte/mca/ras/loadleveler/ras_loadleveler_component.c +++ b/orte/mca/ras/loadleveler/ras_loadleveler_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -42,25 +45,23 @@ static int orte_ras_loadleveler_component_query(mca_base_module_t **module, int orte_ras_base_component_t mca_ras_loadleveler_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_RAS_BASE_VERSION_2_0_0, - + /* Component name and version */ - "loadleveler", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "loadleveler", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - orte_ras_loadleveler_open, - NULL, - orte_ras_loadleveler_component_query, - orte_ras_loadleveler_register + .mca_open_component = orte_ras_loadleveler_open, + .mca_query_component = orte_ras_loadleveler_component_query, + .mca_register_component_params = orte_ras_loadleveler_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int orte_ras_loadleveler_register(void) diff --git a/orte/mca/ras/lsf/ras_lsf_component.c b/orte/mca/ras/lsf/ras_lsf_component.c index 45d616466c..713d540199 100644 --- a/orte/mca/ras/lsf/ras_lsf_component.c +++ b/orte/mca/ras/lsf/ras_lsf_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -10,6 +11,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -36,24 +39,23 @@ static int orte_ras_lsf_component_query(mca_base_module_t **module, int *priorit orte_ras_base_component_t mca_ras_lsf_component = { - { + .base_version = { /* Indicate that we are a ras v2.0.0 component (which also - implies a specific MCA version) */ - + implies a specific MCA version) */ + ORTE_RAS_BASE_VERSION_2_0_0, - - "lsf", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_ras_lsf_open, /* component open */ - orte_ras_lsf_close, /* component close */ - orte_ras_lsf_component_query - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - } + + .mca_component_name = "lsf", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_ras_lsf_open, + .mca_close_component = orte_ras_lsf_close, + .mca_query_component = orte_ras_lsf_component_query, + }, + .base_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, }; diff --git a/orte/mca/ras/simulator/ras_sim_component.c b/orte/mca/ras/simulator/ras_sim_component.c index 1bc797cf38..9b18e70978 100644 --- a/orte/mca/ras/simulator/ras_sim_component.c +++ b/orte/mca/ras/simulator/ras_sim_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -40,25 +43,20 @@ orte_ras_sim_component_t mca_ras_simulator_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_RAS_BASE_VERSION_2_0_0, - + /* Component name and version */ - "simulator", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - - /* Component open and close functions */ - NULL, - NULL, - ras_sim_component_query, - ras_sim_register + .mca_component_name = "simulator", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = ras_sim_component_query, + .mca_register_component_params = ras_sim_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/ras/slurm/ras_slurm_component.c b/orte/mca/ras/slurm/ras_slurm_component.c index ddc578fd7b..5951387960 100644 --- a/orte/mca/ras/slurm/ras_slurm_component.c +++ b/orte/mca/ras/slurm/ras_slurm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,8 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2012-2013 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * @@ -48,25 +49,24 @@ orte_ras_slurm_component_t mca_ras_slurm_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_RAS_BASE_VERSION_2_0_0, /* Component name and version */ - "slurm", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "slurm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - ras_slurm_open, - ras_slurm_close, - orte_ras_slurm_component_query, - ras_slurm_register + .mca_open_component = ras_slurm_open, + .mca_close_component = ras_slurm_close, + .mca_query_component = orte_ras_slurm_component_query, + .mca_register_component_params = ras_slurm_register }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/ras/tm/ras_tm_component.c b/orte/mca/ras/tm/ras_tm_component.c index 504f894b34..544cae45dd 100644 --- a/orte/mca/ras/tm/ras_tm_component.c +++ b/orte/mca/ras/tm/ras_tm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -11,6 +12,8 @@ * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -47,25 +50,23 @@ orte_ras_tm_component_t mca_ras_tm_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_RAS_BASE_VERSION_2_0_0, /* Component name and version */ - "tm", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "tm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - ras_tm_open, - NULL, - orte_ras_tm_component_query, - ras_tm_register + .mca_open_component = ras_tm_open, + .mca_query_component = orte_ras_tm_component_query, + .mca_register_component_params = ras_tm_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/rmaps/lama/rmaps_lama_component.c b/orte/mca/rmaps/lama/rmaps_lama_component.c index 8f9a780a56..a2ae980c72 100644 --- a/orte/mca/rmaps/lama/rmaps_lama_component.c +++ b/orte/mca/rmaps/lama/rmaps_lama_component.c @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -37,22 +40,19 @@ bool rmaps_lama_can_oversubscribe = false; bool rmaps_lama_am_oversubscribing = false; orte_rmaps_base_component_t mca_rmaps_lama_component = { - { + .base_version = { ORTE_RMAPS_BASE_VERSION_2_0_0, - "lama", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - NULL, /* component open */ - NULL, /* component close */ - orte_rmaps_lama_query, /* component query */ - orte_rmaps_lama_register /* component register */ + .mca_component_name = "lama", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = orte_rmaps_lama_query, + .mca_register_component_params = orte_rmaps_lama_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/rmaps/mindist/rmaps_mindist_component.c b/orte/mca/rmaps/mindist/rmaps_mindist_component.c index 200de66b86..7cff26e35b 100644 --- a/orte/mca/rmaps/mindist/rmaps_mindist_component.c +++ b/orte/mca/rmaps/mindist/rmaps_mindist_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved. + * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,22 +39,21 @@ static int orte_rmaps_mindist_register(void); static int my_priority = 20; orte_rmaps_base_component_t mca_rmaps_mindist_component = { - { + .base_version = { ORTE_RMAPS_BASE_VERSION_2_0_0, - "mindist", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_rmaps_mindist_open, /* component open */ - orte_rmaps_mindist_close, /* component close */ - orte_rmaps_mindist_query, /* component query */ - orte_rmaps_mindist_register + .mca_component_name = "mindist", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_rmaps_mindist_open, + .mca_close_component = orte_rmaps_mindist_close, + .mca_query_component = orte_rmaps_mindist_query, + .mca_register_component_params = orte_rmaps_mindist_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/rmaps/ppr/rmaps_ppr_component.c b/orte/mca/rmaps/ppr/rmaps_ppr_component.c index 7e90dc2dcc..6642ff7274 100644 --- a/orte/mca/rmaps/ppr/rmaps_ppr_component.c +++ b/orte/mca/rmaps/ppr/rmaps_ppr_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,22 +30,21 @@ static int orte_rmaps_ppr_query(mca_base_module_t **module, int *priority); static int orte_rmaps_ppr_register(void); orte_rmaps_base_component_t mca_rmaps_ppr_component = { - { + .base_version = { ORTE_RMAPS_BASE_VERSION_2_0_0, - "ppr", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_rmaps_ppr_open, /* component open */ - orte_rmaps_ppr_close, /* component close */ - orte_rmaps_ppr_query, /* component query */ - orte_rmaps_ppr_register + .mca_component_name = "ppr", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_rmaps_ppr_open, + .mca_close_component = orte_rmaps_ppr_close, + .mca_query_component = orte_rmaps_ppr_query, + .mca_register_component_params = orte_rmaps_ppr_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int my_priority; diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c index 3829ae6502..a053f10740 100644 --- a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c +++ b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -12,6 +13,8 @@ * Copyright (c) 2008 Voltaire. All rights reserved * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -52,22 +55,21 @@ orte_rmaps_rf_component_t mca_rmaps_rank_file_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_RMAPS_BASE_VERSION_2_0_0, - "rank_file", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_rmaps_rank_file_open, /* component open */ - orte_rmaps_rank_file_close, /* component close */ - orte_rmaps_rank_file_query, /* component query */ - orte_rmaps_rank_file_register + .mca_component_name = "rank_file", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_rmaps_rank_file_open, + .mca_close_component = orte_rmaps_rank_file_close, + .mca_query_component = orte_rmaps_rank_file_query, + .mca_register_component_params = orte_rmaps_rank_file_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/rmaps/resilient/rmaps_resilient_component.c b/orte/mca/rmaps/resilient/rmaps_resilient_component.c index cb98b76e8d..c2dae6d73e 100644 --- a/orte/mca/rmaps/resilient/rmaps_resilient_component.c +++ b/orte/mca/rmaps/resilient/rmaps_resilient_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -41,22 +44,21 @@ static int my_priority; orte_rmaps_res_component_t mca_rmaps_resilient_component = { { - { + .base_version = { ORTE_RMAPS_BASE_VERSION_2_0_0, - "resilient", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_rmaps_resilient_open, /* component open */ - orte_rmaps_resilient_close, /* component close */ - orte_rmaps_resilient_query, /* component query */ - orte_rmaps_resilient_register + .mca_component_name = "resilient", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_rmaps_resilient_open, + .mca_close_component = orte_rmaps_resilient_close, + .mca_query_component = orte_rmaps_resilient_query, + .mca_register_component_params = orte_rmaps_resilient_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/rmaps/round_robin/rmaps_rr_component.c b/orte/mca/rmaps/round_robin/rmaps_rr_component.c index 05164c76ba..2bfdd18eb9 100644 --- a/orte/mca/rmaps/round_robin/rmaps_rr_component.c +++ b/orte/mca/rmaps/round_robin/rmaps_rr_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -36,22 +39,21 @@ static int orte_rmaps_round_robin_query(mca_base_module_t **module, int *priorit static int my_priority; orte_rmaps_base_component_t mca_rmaps_round_robin_component = { - { + .base_version = { ORTE_RMAPS_BASE_VERSION_2_0_0, - - "round_robin", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_rmaps_round_robin_open, /* component open */ - orte_rmaps_round_robin_close, /* component close */ - orte_rmaps_round_robin_query, /* component query */ - orte_rmaps_round_robin_register + + .mca_component_name = "round_robin", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_rmaps_round_robin_open, + .mca_close_component = orte_rmaps_round_robin_close, + .mca_query_component = orte_rmaps_round_robin_query, + .mca_register_component_params = orte_rmaps_round_robin_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/rmaps/seq/rmaps_seq_component.c b/orte/mca/rmaps/seq/rmaps_seq_component.c index 0411cd8823..81b4b6b52a 100644 --- a/orte/mca/rmaps/seq/rmaps_seq_component.c +++ b/orte/mca/rmaps/seq/rmaps_seq_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -36,22 +39,21 @@ static int orte_rmaps_seq_query(mca_base_module_t **module, int *priority); static int my_priority; orte_rmaps_base_component_t mca_rmaps_seq_component = { - { + .base_version = { ORTE_RMAPS_BASE_VERSION_2_0_0, - "seq", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_rmaps_seq_open, /* component open */ - orte_rmaps_seq_close, /* component close */ - orte_rmaps_seq_query, /* component query */ - orte_rmaps_seq_register - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - } + .mca_component_name = "seq", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_rmaps_seq_open, + .mca_close_component = orte_rmaps_seq_close, + .mca_query_component = orte_rmaps_seq_query, + .mca_register_component_params = orte_rmaps_seq_register, + }, + .base_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, }; diff --git a/orte/mca/rmaps/staged/rmaps_staged_component.c b/orte/mca/rmaps/staged/rmaps_staged_component.c index 343bb0b476..42afa1a134 100644 --- a/orte/mca/rmaps/staged/rmaps_staged_component.c +++ b/orte/mca/rmaps/staged/rmaps_staged_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,21 +28,20 @@ static int orte_rmaps_staged_close(void); static int orte_rmaps_staged_query(mca_base_module_t **module, int *priority); orte_rmaps_base_component_t mca_rmaps_staged_component = { - { + .base_version = { ORTE_RMAPS_BASE_VERSION_2_0_0, - "staged", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - orte_rmaps_staged_open, /* component open */ - orte_rmaps_staged_close, /* component close */ - orte_rmaps_staged_query /* component query */ + .mca_component_name = "staged", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = orte_rmaps_staged_open, + .mca_close_component = orte_rmaps_staged_close, + .mca_query_component = orte_rmaps_staged_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/rml/ftrm/rml_ftrm_component.c b/orte/mca/rml/ftrm/rml_ftrm_component.c index 7cd5a69b23..9b0d86795f 100644 --- a/orte/mca/rml/ftrm/rml_ftrm_component.c +++ b/orte/mca/rml/ftrm/rml_ftrm_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * University Research and Technology @@ -9,6 +10,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,25 +41,23 @@ static int orte_rml_ftrm_close(void); orte_rml_component_t mca_rml_ftrm_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .rml_version = { ORTE_RML_BASE_VERSION_2_0_0, - "ftrm", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ + .mca_component_name = "ftrm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), - orte_rml_ftrm_open, /* component open */ - orte_rml_ftrm_close, /* component close */ - NULL, - orte_rml_ftrm_register, - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, + .mca_open_component = orte_rml_ftrm_open, + .mca_close_component = orte_rml_ftrm_close, + .mca_register_component_params = orte_rml_ftrm_register, + }, + .rml_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, - orte_rml_ftrm_component_init + .rml_init = orte_rml_ftrm_component_init, }; orte_rml_module_t orte_rml_ftrm_module = { diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c index 9c007658d0..8ec17ccaaa 100644 --- a/orte/mca/rml/oob/rml_oob_component.c +++ b/orte/mca/rml/oob/rml_oob_component.c @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2011-2013 Los Alamos National Security, LLC. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. * All rights reserved. * $COPYRIGHT$ * @@ -61,21 +61,20 @@ orte_rml_component_t mca_rml_oob_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .rml_version = { ORTE_RML_BASE_VERSION_2_0_0, - "oob", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - rml_oob_open, /* component open */ - rml_oob_close, /* component close */ - }, - { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, - rml_oob_init + .mca_component_name = "oob", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_open_component = rml_oob_open, + .mca_close_component = rml_oob_close, + }, + .rml_data = { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, + .rml_init = rml_oob_init, }; orte_rml_oob_module_t orte_rml_oob_module = { diff --git a/orte/mca/routed/binomial/routed_binomial_component.c b/orte/mca/routed/binomial/routed_binomial_component.c index 1341ed7de5..a335226ac5 100644 --- a/orte/mca/routed/binomial/routed_binomial_component.c +++ b/orte/mca/routed/binomial/routed_binomial_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2007-2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights + * reserved. * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. * $COPYRIGHT$ @@ -24,24 +25,21 @@ static int orte_routed_binomial_component_query(mca_base_module_t **module, int * component definition */ orte_routed_component_t mca_routed_binomial_component = { - /* First, the mca_base_component_t struct containing meta - information about the component itself */ + /* First, the mca_base_component_t struct containing meta + information about the component itself */ - { + .base_version = { ORTE_ROUTED_BASE_VERSION_2_0_0, - "binomial", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - NULL, - NULL, - orte_routed_binomial_component_query - }, - { - /* This component can be checkpointed */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - } + .mca_component_name = "binomial", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = orte_routed_binomial_component_query + }, + .base_data = { + /* This component can be checkpointed */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, }; static int orte_routed_binomial_component_query(mca_base_module_t **module, int *priority) diff --git a/orte/mca/routed/debruijn/routed_debruijn_component.c b/orte/mca/routed/debruijn/routed_debruijn_component.c index ab93df5476..ca70da9689 100644 --- a/orte/mca/routed/debruijn/routed_debruijn_component.c +++ b/orte/mca/routed/debruijn/routed_debruijn_component.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2007-2012 Los Alamos National Security, LLC. + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. @@ -28,21 +28,18 @@ orte_routed_component_t mca_routed_debruijn_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_ROUTED_BASE_VERSION_2_0_0, - "debruijn", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - NULL, - NULL, - orte_routed_debruijn_component_query - }, - { - /* This component can be checkpointed */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - } + .mca_component_name = "debruijn", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = orte_routed_debruijn_component_query + }, + .base_data = { + /* This component can be checkpointed */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, }; static int orte_routed_debruijn_component_query(mca_base_module_t **module, int *priority) diff --git a/orte/mca/routed/direct/routed_direct_component.c b/orte/mca/routed/direct/routed_direct_component.c index 1ad2d3f8f2..4082e97296 100644 --- a/orte/mca/routed/direct/routed_direct_component.c +++ b/orte/mca/routed/direct/routed_direct_component.c @@ -1,5 +1,6 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2007 Los Alamos National Security, LLC. + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. @@ -31,21 +32,18 @@ orte_routed_component_t mca_routed_direct_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .base_version = { ORTE_ROUTED_BASE_VERSION_2_0_0, - "direct", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - NULL, - NULL, - orte_routed_direct_component_query - }, - { - /* This component can be checkpointed */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - } + .mca_component_name = "direct", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = orte_routed_direct_component_query + }, + .base_data = { + /* This component can be checkpointed */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + }, }; static int orte_routed_direct_component_query(mca_base_module_t **module, int *priority) diff --git a/orte/mca/routed/radix/routed_radix_component.c b/orte/mca/routed/radix/routed_radix_component.c index 57cca917d9..aa8e1fb684 100644 --- a/orte/mca/routed/radix/routed_radix_component.c +++ b/orte/mca/routed/radix/routed_radix_component.c @@ -1,5 +1,6 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2007-2013 Los Alamos National Security, LLC. + * Copyright (c) 2007-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2004-2008 The Trustees of Indiana University. * All rights reserved. @@ -31,22 +32,19 @@ orte_routed_radix_component_t mca_routed_radix_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - ORTE_ROUTED_BASE_VERSION_2_0_0, + .base_version = { + ORTE_ROUTED_BASE_VERSION_2_0_0, - "radix", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - NULL, - NULL, - orte_routed_radix_component_query, - orte_routed_radix_component_register + .mca_component_name = "radix", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = orte_routed_radix_component_query, + .mca_register_component_params = orte_routed_radix_component_register, + }, + .base_data = { + /* This component can be checkpointed */ + MCA_BASE_METADATA_PARAM_CHECKPOINT }, - { - /* This component can be checkpointed */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - } } }; diff --git a/orte/mca/rtc/freq/rtc_freq_component.c b/orte/mca/rtc/freq/rtc_freq_component.c index 005c923a50..a3279b0ac6 100644 --- a/orte/mca/rtc/freq/rtc_freq_component.c +++ b/orte/mca/rtc/freq/rtc_freq_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,22 +30,19 @@ static int my_priority; orte_rtc_freq_component_t mca_rtc_freq_component = { { - { + .base_version = { ORTE_RTC_BASE_VERSION_1_0_0, - "freq", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - NULL, /* component open */ - NULL, /* component close */ - rtc_freq_query, /* component query */ - rtc_freq_register /* component register */ + .mca_component_name = "freq", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = rtc_freq_query, + .mca_register_component_params = rtc_freq_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, } }; diff --git a/orte/mca/rtc/hwloc/rtc_hwloc_component.c b/orte/mca/rtc/hwloc/rtc_hwloc_component.c index 0a42d47bea..61660c5eed 100644 --- a/orte/mca/rtc/hwloc/rtc_hwloc_component.c +++ b/orte/mca/rtc/hwloc/rtc_hwloc_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Intel, Inc. All rights reserved + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,22 +27,19 @@ static int rtc_hwloc_register(void); static int my_priority; orte_rtc_base_component_t mca_rtc_hwloc_component = { - { + .base_version = { ORTE_RTC_BASE_VERSION_1_0_0, - "hwloc", /* MCA component name */ - ORTE_MAJOR_VERSION, /* MCA component major version */ - ORTE_MINOR_VERSION, /* MCA component minor version */ - ORTE_RELEASE_VERSION, /* MCA component release version */ - NULL, /* component open */ - NULL, /* component close */ - rtc_hwloc_query, /* component query */ - rtc_hwloc_register /* component register */ + .mca_component_name = "hwloc", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = rtc_hwloc_query, + .mca_register_component_params = rtc_hwloc_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; diff --git a/orte/mca/schizo/ompi/schizo_ompi_component.c b/orte/mca/schizo/ompi/schizo_ompi_component.c index 3c30919850..bc87bb6a93 100644 --- a/orte/mca/schizo/ompi/schizo_ompi_component.c +++ b/orte/mca/schizo/ompi/schizo_ompi_component.c @@ -1,6 +1,8 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -23,21 +25,17 @@ static int component_query(mca_base_module_t **module, int *priority); * Struct of function pointers and all that to let us be initialized */ orte_schizo_base_component_t mca_schizo_ompi_component = { - { + .base_version = { MCA_SCHIZO_BASE_VERSION_1_0_0, - "ompi", /* MCA module name */ - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - NULL, /* component open */ - NULL, /* component close */ - component_query, /* component query */ - NULL, /* component register */ + .mca_component_name = "ompi", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + .mca_query_component = component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT - } + }, }; static int component_query(mca_base_module_t **module, int *priority) diff --git a/orte/mca/snapc/full/snapc_full_component.c b/orte/mca/snapc/full/snapc_full_component.c index b953e17782..554e2444a7 100644 --- a/orte/mca/snapc/full/snapc_full_component.c +++ b/orte/mca/snapc/full/snapc_full_component.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2004-2010 The Trustees of Indiana University. * All rights reserved. @@ -7,6 +8,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -49,29 +52,26 @@ orte_snapc_full_component_t mca_snapc_full_component = { /* Handle the general mca_component_t struct containing * meta information about the component itfull */ - { + .base_version = { ORTE_SNAPC_BASE_VERSION_2_0_0, /* Component name and version */ - "full", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "full", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - snapc_full_open, - snapc_full_close, - orte_snapc_full_component_query, - snapc_full_register + .mca_open_component = snapc_full_open, + .mca_close_component = snapc_full_close, + .mca_query_component = orte_snapc_full_component_query, + .mca_register_component_params = snapc_full_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - /* Verbosity level */ - 0, - /* opal_output handler */ - -1 + .verbose = 0, + .output_handle = -1, } }; diff --git a/orte/mca/sstore/central/sstore_central_component.c b/orte/mca/sstore/central/sstore_central_component.c index faab55cc8c..588f6198d8 100644 --- a/orte/mca/sstore/central/sstore_central_component.c +++ b/orte/mca/sstore/central/sstore_central_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 The Trustees of Indiana University. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -39,29 +42,26 @@ orte_sstore_central_component_t mca_sstore_central_component = { /* Handle the general mca_component_t struct containing * meta information about the component itcentral */ - { + .base_version = { ORTE_SSTORE_BASE_VERSION_2_0_0, /* Component name and version */ - "central", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "central", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - sstore_central_open, - sstore_central_close, - orte_sstore_central_component_query, - sstore_central_register + .mca_open_component = sstore_central_open, + .mca_close_component = sstore_central_close, + .mca_query_component = orte_sstore_central_component_query, + .mca_register_component_params = sstore_central_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - /* Verbosity level */ - 0, - /* opal_output handler */ - -1 + .verbose = 0, + .output_handle = -1, }, }; diff --git a/orte/mca/sstore/stage/sstore_stage_component.c b/orte/mca/sstore/stage/sstore_stage_component.c index 8a3834613a..f437e035da 100644 --- a/orte/mca/sstore/stage/sstore_stage_component.c +++ b/orte/mca/sstore/stage/sstore_stage_component.c @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2010 The Trustees of Indiana University. * All rights reserved. * Copyright (c) 2014 Hochschule Esslingen. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -41,29 +44,26 @@ orte_sstore_stage_component_t mca_sstore_stage_component = { /* Handle the general mca_component_t struct containing * meta information about the component itstage */ - { + .base_version = { ORTE_SSTORE_BASE_VERSION_2_0_0, /* Component name and version */ - "stage", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "stage", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - sstore_stage_open, - sstore_stage_close, - orte_sstore_stage_component_query, - sstore_stage_register + .mca_open_component = sstore_stage_open, + .mca_close_component = sstore_stage_close, + .mca_query_component = orte_sstore_stage_component_query, + .mca_register_component_params = sstore_stage_register, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - /* Verbosity level */ - 0, - /* opal_output handler */ - -1 + .verbose = 0, + .output_handle = -1, }, }; diff --git a/orte/mca/state/app/state_app_component.c b/orte/mca/state/app/state_app_component.c index f041fc49cb..71a00c42d2 100644 --- a/orte/mca/state/app/state_app_component.c +++ b/orte/mca/state/app/state_app_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -38,20 +39,19 @@ orte_state_base_component_t mca_state_app_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_STATE_BASE_VERSION_1_0_0, /* Component name and version */ - "app", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "app", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - state_app_open, - state_app_close, - state_app_component_query + .mca_open_component = state_app_open, + .mca_close_component = state_app_close, + .mca_query_component = state_app_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/state/dvm/state_dvm_component.c b/orte/mca/state/dvm/state_dvm_component.c index 07909fc22e..ad7a0cc21e 100644 --- a/orte/mca/state/dvm/state_dvm_component.c +++ b/orte/mca/state/dvm/state_dvm_component.c @@ -1,5 +1,8 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -37,20 +40,19 @@ orte_state_base_component_t mca_state_dvm_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_STATE_BASE_VERSION_1_0_0, /* Component name and version */ - "dvm", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "dvm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - state_dvm_open, - state_dvm_close, - state_dvm_component_query + .mca_open_component = state_dvm_open, + .mca_close_component = state_dvm_close, + .mca_query_component = state_dvm_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/state/hnp/state_hnp_component.c b/orte/mca/state/hnp/state_hnp_component.c index dae9b30472..0143be477b 100644 --- a/orte/mca/state/hnp/state_hnp_component.c +++ b/orte/mca/state/hnp/state_hnp_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -38,20 +39,19 @@ orte_state_base_component_t mca_state_hnp_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_STATE_BASE_VERSION_1_0_0, /* Component name and version */ - "hnp", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "hnp", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - state_hnp_open, - state_hnp_close, - state_hnp_component_query + .mca_open_component = state_hnp_open, + .mca_close_component = state_hnp_close, + .mca_query_component = state_hnp_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/state/novm/state_novm_component.c b/orte/mca/state/novm/state_novm_component.c index 8fa3cb3275..c31006b0ed 100644 --- a/orte/mca/state/novm/state_novm_component.c +++ b/orte/mca/state/novm/state_novm_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011-2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -39,21 +40,20 @@ orte_state_base_component_t mca_state_novm_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_STATE_BASE_VERSION_1_0_0, /* Component name and version */ - "novm", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "novm", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - state_novm_open, - state_novm_close, - state_novm_component_query, - state_novm_register + .mca_open_component = state_novm_open, + .mca_close_component = state_novm_close, + .mca_query_component = state_novm_component_query, + .mca_register_component_params = state_novm_register }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/state/orted/state_orted_component.c b/orte/mca/state/orted/state_orted_component.c index 3033c00911..06d3a3a42a 100644 --- a/orte/mca/state/orted/state_orted_component.c +++ b/orte/mca/state/orted/state_orted_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -38,20 +39,19 @@ orte_state_base_component_t mca_state_orted_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_STATE_BASE_VERSION_1_0_0, /* Component name and version */ - "orted", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "orted", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - state_orted_open, - state_orted_close, - state_orted_component_query + .mca_open_component = state_orted_open, + .mca_close_component = state_orted_close, + .mca_query_component = state_orted_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/state/staged_hnp/state_staged_hnp_component.c b/orte/mca/state/staged_hnp/state_staged_hnp_component.c index 19dec94efe..043cf033bb 100644 --- a/orte/mca/state/staged_hnp/state_staged_hnp_component.c +++ b/orte/mca/state/staged_hnp/state_staged_hnp_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -38,20 +39,19 @@ orte_state_base_component_t mca_state_staged_hnp_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_STATE_BASE_VERSION_1_0_0, /* Component name and version */ - "staged_hnp", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "staged_hnp", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - state_staged_hnp_open, - state_staged_hnp_close, - state_staged_hnp_component_query + .mca_open_component = state_staged_hnp_open, + .mca_close_component = state_staged_hnp_close, + .mca_query_component = state_staged_hnp_component_query }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/state/staged_orted/state_staged_orted_component.c b/orte/mca/state/staged_orted/state_staged_orted_component.c index 06c1438584..8296de7d21 100644 --- a/orte/mca/state/staged_orted/state_staged_orted_component.c +++ b/orte/mca/state/staged_orted/state_staged_orted_component.c @@ -1,6 +1,7 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012 Los Alamos National Security, LLC. - * All rights reserved. + * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights + * reserved. * * $COPYRIGHT$ * @@ -38,20 +39,19 @@ orte_state_base_component_t mca_state_staged_orted_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_STATE_BASE_VERSION_1_0_0, /* Component name and version */ - "staged_orted", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, - + .mca_component_name = "staged_orted", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), + /* Component open and close functions */ - state_staged_orted_open, - state_staged_orted_close, - state_staged_orted_component_query + .mca_open_component = state_staged_orted_open, + .mca_close_component = state_staged_orted_close, + .mca_query_component = state_staged_orted_component_query, }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/orte/mca/state/tool/state_tool_component.c b/orte/mca/state/tool/state_tool_component.c index 7f3ff97e2d..3ee17a0df0 100644 --- a/orte/mca/state/tool/state_tool_component.c +++ b/orte/mca/state/tool/state_tool_component.c @@ -1,5 +1,6 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2011 Los Alamos National Security, LLC. + * Copyright (c) 2011-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2013 Intel, Inc. All rights reserved. * @@ -39,20 +40,19 @@ orte_state_base_component_t mca_state_tool_component = /* Handle the general mca_component_t struct containing * meta information about the component */ - { + .base_version = { ORTE_STATE_BASE_VERSION_1_0_0, /* Component name and version */ - "tool", - ORTE_MAJOR_VERSION, - ORTE_MINOR_VERSION, - ORTE_RELEASE_VERSION, + .mca_component_name = "tool", + MCA_BASE_MAKE_VERSION(component, ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION, + ORTE_RELEASE_VERSION), /* Component open and close functions */ - state_tool_open, - state_tool_close, - state_tool_component_query + .mca_open_component = state_tool_open, + .mca_close_component = state_tool_close, + .mca_query_component = state_tool_component_query }, - { + .base_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, diff --git a/oshmem/mca/atomic/basic/atomic_basic_component.c b/oshmem/mca/atomic/basic/atomic_basic_component.c index be16d11c73..a1f448d126 100644 --- a/oshmem/mca/atomic/basic/atomic_basic_component.c +++ b/oshmem/mca/atomic/basic/atomic_basic_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -41,34 +44,27 @@ mca_atomic_base_component_t mca_atomic_basic_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .atomic_version = { MCA_ATOMIC_BASE_VERSION_2_0_0, /* Component name and version */ - "basic", - OSHMEM_MAJOR_VERSION, - OSHMEM_MINOR_VERSION, - OSHMEM_RELEASE_VERSION, + .mca_component_name = "basic", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), - /* component open */ - _basic_open, - /* component close */ - NULL, - /* component query */ - NULL, - /* component register */ - _basic_register + .mca_open_component = _basic_open, + .mca_register_component_params = _basic_register, }, - { + .atomic_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ - mca_atomic_basic_init, - mca_atomic_basic_finalize, - mca_atomic_basic_query + .atomic_init = mca_atomic_basic_init, + .atomic_finalize = mca_atomic_basic_finalize, + .atomic_query = mca_atomic_basic_query, }; static int _basic_register(void) diff --git a/oshmem/mca/atomic/mxm/atomic_mxm_component.c b/oshmem/mca/atomic/mxm/atomic_mxm_component.c index 36e3ebd0b8..0c6118f5d3 100644 --- a/oshmem/mca/atomic/mxm/atomic_mxm_component.c +++ b/oshmem/mca/atomic/mxm/atomic_mxm_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -45,34 +48,27 @@ mca_atomic_base_component_t mca_atomic_mxm_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .atomic_version = { MCA_ATOMIC_BASE_VERSION_2_0_0, /* Component name and version */ - "mxm", - OSHMEM_MAJOR_VERSION, - OSHMEM_MINOR_VERSION, - OSHMEM_RELEASE_VERSION, + .mca_component_name = "mxm", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), - /* component open */ - _mxm_open, - /* component close */ - NULL, - /* component query */ - NULL, - /* component register */ - _mxm_register + .mca_open_component = _mxm_open, + .mca_register_component_params = _mxm_register, }, - { + .atomic_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ - mca_atomic_mxm_init, - mca_atomic_mxm_finalize, - mca_atomic_mxm_query + .atomic_init = mca_atomic_mxm_init, + .atomic_finalize = mca_atomic_mxm_finalize, + .atomic_query = mca_atomic_mxm_query, }; static int _mxm_register(void) diff --git a/oshmem/mca/memheap/buddy/memheap_buddy_component.c b/oshmem/mca/memheap/buddy/memheap_buddy_component.c index 2384c264bb..dda1e097cc 100644 --- a/oshmem/mca/memheap/buddy/memheap_buddy_component.c +++ b/oshmem/mca/memheap/buddy/memheap_buddy_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -21,23 +24,21 @@ static mca_memheap_base_module_t* mca_memheap_buddy_component_init(memheap_conte static int _basic_open(void); mca_memheap_base_component_t mca_memheap_buddy_component = { - { + .memheap_version = { MCA_MEMHEAP_BASE_VERSION_2_0_0, - "buddy", /* MCA component name */ - OSHMEM_MAJOR_VERSION, /* MCA component major version */ - OSHMEM_MINOR_VERSION, /* MCA component minor version */ - OSHMEM_RELEASE_VERSION, /* MCA component release version */ + .mca_component_name = "buddy", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), - _basic_open, - mca_memheap_buddy_component_close, - NULL + .mca_open_component = _basic_open, + .mca_close_component = mca_memheap_buddy_component_close, }, - { + .memheap_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_memheap_buddy_component_init + .memheap_init = mca_memheap_buddy_component_init, }; /* Open component */ diff --git a/oshmem/mca/memheap/ptmalloc/memheap_ptmalloc_component.c b/oshmem/mca/memheap/ptmalloc/memheap_ptmalloc_component.c index 282f871cb5..cffc79f471 100644 --- a/oshmem/mca/memheap/ptmalloc/memheap_ptmalloc_component.c +++ b/oshmem/mca/memheap/ptmalloc/memheap_ptmalloc_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -21,23 +24,21 @@ static mca_memheap_base_module_t* mca_memheap_ptmalloc_component_init(memheap_co static int _basic_open(void); mca_memheap_base_component_t mca_memheap_ptmalloc_component = { - { + .memheap_version = { MCA_MEMHEAP_BASE_VERSION_2_0_0, - "ptmalloc", /* MCA component name */ - OSHMEM_MAJOR_VERSION, /* MCA component major version */ - OSHMEM_MINOR_VERSION, /* MCA component minor version */ - OSHMEM_RELEASE_VERSION, /* MCA component release version */ - - _basic_open, - mca_memheap_ptmalloc_component_close, - NULL + .mca_component_name= "ptmalloc", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), + + .mca_open_component = _basic_open, + .mca_close_component = mca_memheap_ptmalloc_component_close, }, - { + .memheap_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_memheap_ptmalloc_component_init + .memheap_init = mca_memheap_ptmalloc_component_init, }; /* Open component */ diff --git a/oshmem/mca/scoll/basic/scoll_basic_component.c b/oshmem/mca/scoll/basic/scoll_basic_component.c index 09814eb496..3b8263c621 100644 --- a/oshmem/mca/scoll/basic/scoll_basic_component.c +++ b/oshmem/mca/scoll/basic/scoll_basic_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -48,30 +51,28 @@ mca_scoll_base_component_t mca_scoll_basic_component = { /* First, the mca_component_t struct containing meta information about the component itself */ - { + .scoll_version = { MCA_SCOLL_BASE_VERSION_2_0_0, /* Component name and version */ - "basic", - OSHMEM_MAJOR_VERSION, - OSHMEM_MINOR_VERSION, - OSHMEM_RELEASE_VERSION, + .mca_component_name = "basic", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), /* Component open and close functions */ - basic_open, - basic_close, - NULL, - basic_register + .mca_open_component = basic_open, + .mca_close_component = basic_close, + .mca_register_component_params = basic_register, }, - { + .scoll_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, /* Initialization / querying functions */ - mca_scoll_basic_init, - mca_scoll_basic_query + .scoll_init = mca_scoll_basic_init, + .scoll_query = mca_scoll_basic_query, }; static int basic_register(void) diff --git a/oshmem/mca/scoll/fca/scoll_fca_component.c b/oshmem/mca/scoll/fca/scoll_fca_component.c index 387eb0c0ad..4efbe49d01 100644 --- a/oshmem/mca/scoll/fca/scoll_fca_component.c +++ b/oshmem/mca/scoll/fca/scoll_fca_component.c @@ -1,8 +1,11 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -58,30 +61,28 @@ mca_scoll_fca_component_t mca_scoll_fca_component = { /* First, the mca_component_t struct containing meta information * about the component itfca */ { - { + .scoll_version = { MCA_SCOLL_BASE_VERSION_2_0_0, /* Component name and version */ - "fca", - OSHMEM_MAJOR_VERSION, - OSHMEM_MINOR_VERSION, - OSHMEM_RELEASE_VERSION, + .mca_component_name = "fca", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), /* Component open and close functions */ - fca_open, - fca_close, - NULL, - fca_register + .mca_open_component = fca_open, + .mca_close_component = fca_close, + .mca_register_component_params = fca_register, }, - { + .scoll_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, /* Initialization / querying functions */ - mca_scoll_fca_init_query, - mca_scoll_fca_comm_query, + .scoll_init = mca_scoll_fca_init_query, + .scoll_query = mca_scoll_fca_comm_query, } }; diff --git a/oshmem/mca/scoll/mpi/scoll_mpi_component.c b/oshmem/mca/scoll/mpi/scoll_mpi_component.c index 73e6b405e4..0e5d46236b 100644 --- a/oshmem/mca/scoll/mpi/scoll_mpi_component.c +++ b/oshmem/mca/scoll/mpi/scoll_mpi_component.c @@ -1,10 +1,13 @@ -/** - Copyright (c) 2011 Mellanox Technologies. All rights reserved. - $COPYRIGHT$ - - Additional copyrights may follow - - $HEADER$ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2011 Mellanox Technologies. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ */ #include @@ -29,30 +32,28 @@ mca_scoll_mpi_component_t mca_scoll_mpi_component = { /* First, the mca_component_t struct containing meta information about the component itfca */ { - { + .scoll_version = { MCA_SCOLL_BASE_VERSION_2_0_0, /* Component name and version */ - "mpi", - OSHMEM_MAJOR_VERSION, - OSHMEM_MINOR_VERSION, - OSHMEM_RELEASE_VERSION, + .mca_component_name = "mpi", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), /* Component open and close functions */ - mpi_open, - mpi_close, - NULL, - mpi_register + .mca_open_component = mpi_open, + .mca_close_component = mpi_close, + .mca_register_component_params = mpi_register, }, - { + .scoll_data = { /* The component is not checkpoint ready */ MCA_BASE_METADATA_PARAM_NONE }, /* Initialization / querying functions */ - mca_scoll_mpi_init_query, - mca_scoll_mpi_comm_query, + .scoll_init = mca_scoll_mpi_init_query, + .scoll_query = mca_scoll_mpi_comm_query, }, 77, /* priority */ 0, /* verbose level */ diff --git a/oshmem/mca/spml/ikrit/spml_ikrit_component.c b/oshmem/mca/spml/ikrit/spml_ikrit_component.c index 68333f7f75..abd2f00c74 100644 --- a/oshmem/mca/spml/ikrit/spml_ikrit_component.c +++ b/oshmem/mca/spml/ikrit/spml_ikrit_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013-2015 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -37,26 +40,23 @@ mca_spml_base_component_2_0_0_t mca_spml_ikrit_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { - MCA_SPML_BASE_VERSION_2_0_0, + .spmlm_version = { + MCA_SPML_BASE_VERSION_2_0_0, - "ikrit", /* MCA component name */ - OSHMEM_MAJOR_VERSION, /* MCA component major version */ - OSHMEM_MINOR_VERSION, /* MCA component minor version */ - OSHMEM_RELEASE_VERSION, /* MCA component release version */ - mca_spml_ikrit_component_open, /* component open */ - mca_spml_ikrit_component_close, /* component close */ - NULL, - mca_spml_ikrit_component_register + .mca_component_name = "ikrit", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), + .mca_open_component = mca_spml_ikrit_component_open, + .mca_close_component = mca_spml_ikrit_component_close, + .mca_register_component_params = mca_spml_ikrit_component_register, }, - { + .spmlm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_spml_ikrit_component_init, /* component init */ - mca_spml_ikrit_component_fini /* component finalize */ - + .spmlm_init = mca_spml_ikrit_component_init, + .spmlm_finalize = mca_spml_ikrit_component_fini, }; #if MXM_API >= MXM_VERSION(2,1) diff --git a/oshmem/mca/spml/yoda/spml_yoda_component.c b/oshmem/mca/spml/yoda/spml_yoda_component.c index 8de17ce8f8..26f67fbc39 100644 --- a/oshmem/mca/spml/yoda/spml_yoda_component.c +++ b/oshmem/mca/spml/yoda/spml_yoda_component.c @@ -1,6 +1,9 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,26 +33,23 @@ mca_spml_base_component_2_0_0_t mca_spml_yoda_component = { /* First, the mca_base_component_t struct containing meta information about the component itself */ - { + .spmlm_version = { MCA_SPML_BASE_VERSION_2_0_0, - "yoda", /* MCA component name */ - OSHMEM_MAJOR_VERSION, /* MCA component major version */ - OSHMEM_MINOR_VERSION, /* MCA component minor version */ - OSHMEM_RELEASE_VERSION, /* MCA component release version */ - mca_spml_yoda_component_open, /* component open */ - mca_spml_yoda_component_close, /* component close */ - NULL, - mca_spml_yoda_component_register + .mca_component_name = "yoda", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), + .mca_open_component = mca_spml_yoda_component_open, + .mca_close_component = mca_spml_yoda_component_close, + .mca_register_component_params = mca_spml_yoda_component_register, }, - { + .spmlm_data = { /* The component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mca_spml_yoda_component_init, /* component init */ - mca_spml_yoda_component_fini /* component finalize */ - + .spmlm_init = mca_spml_yoda_component_init, + .spmlm_finalize = mca_spml_yoda_component_fini, }; static inline void mca_spml_yoda_param_register_int(const char *param_name, diff --git a/oshmem/mca/sshmem/mmap/sshmem_mmap_component.c b/oshmem/mca/sshmem/mmap/sshmem_mmap_component.c index e595ee8963..d2cd8315d5 100644 --- a/oshmem/mca/sshmem/mmap/sshmem_mmap_component.c +++ b/oshmem/mca/sshmem/mmap/sshmem_mmap_component.c @@ -1,7 +1,10 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -51,30 +54,25 @@ mca_sshmem_mmap_component_t mca_sshmem_mmap_component = { /** * common MCA component data */ - { + .base_version = { MCA_SSHMEM_BASE_VERSION_2_0_0, /* component name and version */ - "mmap", - OSHMEM_MAJOR_VERSION, - OSHMEM_MINOR_VERSION, - OSHMEM_RELEASE_VERSION, + .mca_component_name = "mmap", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), - /* component open */ - mmap_open, - /* component close */ - mmap_close, - /* component query */ - mmap_query, - /* component register */ - mmap_register + .mca_open_component = mmap_open, + .mca_close_component = mmap_close, + .mca_query_component = mmap_query, + .mca_register_component_params = mmap_register, }, /* MCA v2.0.0 component meta data */ - { + .base_data = { /* the component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - mmap_runtime_query, + .runtime_query = mmap_runtime_query, }, }; diff --git a/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c b/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c index e12c016fff..c66a99e8ef 100644 --- a/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c +++ b/oshmem/mca/sshmem/sysv/sshmem_sysv_component.c @@ -1,8 +1,11 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -63,29 +66,24 @@ mca_sshmem_sysv_component_t mca_sshmem_sysv_component = { /* ////////////////////////////////////////////////////////////////////// */ { /* common MCA component data */ - { + .base_version = { MCA_SSHMEM_BASE_VERSION_2_0_0, /* component name and version */ - "sysv", - OSHMEM_MAJOR_VERSION, - OSHMEM_MINOR_VERSION, - OSHMEM_RELEASE_VERSION, + .mca_component_name = "sysv", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), - /* component open */ - sysv_open, - /* component close */ - NULL, - /* component query */ - sysv_query, - sysv_register + .mca_open_component = sysv_open, + .mca_query_component = sysv_query, + .mca_register_component_params = sysv_register, }, /* MCA v2.0.0 component meta data */ - { + .base_data = { /* the component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - sysv_runtime_query, + .runtime_query = sysv_runtime_query, }, /* ////////////////////////////////////////////////////////////////////// */ /* sysv component-specific information */ diff --git a/oshmem/mca/sshmem/verbs/sshmem_verbs_component.c b/oshmem/mca/sshmem/verbs/sshmem_verbs_component.c index 146b1802af..c0d6473e0c 100644 --- a/oshmem/mca/sshmem/verbs/sshmem_verbs_component.c +++ b/oshmem/mca/sshmem/verbs/sshmem_verbs_component.c @@ -1,9 +1,12 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 NVIDIA Corporation. All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -59,30 +62,25 @@ mca_sshmem_verbs_component_t mca_sshmem_verbs_component = { /** * common MCA component data */ - { + .base_version = { MCA_SSHMEM_BASE_VERSION_2_0_0, /* component name and version */ - "verbs", - OSHMEM_MAJOR_VERSION, - OSHMEM_MINOR_VERSION, - OSHMEM_RELEASE_VERSION, + .mca_component_name = "verbs", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), - /* component open */ - verbs_open, - /* component close */ - verbs_close, - /* component query */ - verbs_query, - /* component register */ - verbs_register + .mca_open_component = verbs_open, + .mca_close_component = verbs_close, + .mca_query_component = verbs_query, + .mca_register_component_params = verbs_register, }, /* MCA v2.0.0 component meta data */ - { + .base_data = { /* the component is checkpoint ready */ MCA_BASE_METADATA_PARAM_CHECKPOINT }, - verbs_runtime_query, + .runtime_query = verbs_runtime_query, }, };