From 45e053dbce5cb30ae6471a53829f11c5aef3c1e0 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Fri, 17 Apr 2015 19:00:31 -0600 Subject: [PATCH] orte: use C99 subobject naming for component initialization This commit helps future-proof orte components by initializing each component member by name. Signed-off-by: Nathan Hjelm --- orte/mca/dfs/app/dfs_app_component.c | 23 ++++---- orte/mca/dfs/orted/dfs_orted_component.c | 28 +++++----- orte/mca/dfs/test/dfs_test_component.c | 25 ++++----- .../errmgr_default_app_component.c | 24 +++++---- .../errmgr_default_hnp_component.c | 24 +++++---- .../errmgr_default_orted_component.c | 26 ++++----- .../errmgr_default_tool_component.c | 21 ++++---- orte/mca/ess/alps/ess_alps_component.c | 22 ++++---- orte/mca/ess/env/ess_env_component.c | 22 ++++---- orte/mca/ess/hnp/ess_hnp_component.c | 22 ++++---- orte/mca/ess/lsf/ess_lsf_component.c | 22 ++++---- orte/mca/ess/pmi/ess_pmi_component.c | 22 ++++---- .../ess/singleton/ess_singleton_component.c | 24 +++++---- orte/mca/ess/slurm/ess_slurm_component.c | 22 ++++---- orte/mca/ess/tm/ess_tm_component.c | 22 ++++---- orte/mca/ess/tool/ess_tool_component.c | 22 ++++---- orte/mca/filem/raw/filem_raw_component.c | 26 ++++----- .../mca/grpcomm/brks/grpcomm_brks_component.c | 25 +++++---- .../grpcomm/direct/grpcomm_direct_component.c | 25 +++++---- orte/mca/grpcomm/rcd/grpcomm_rcd_component.c | 25 +++++---- orte/mca/iof/hnp/iof_hnp_component.c | 25 ++++----- orte/mca/iof/mr_hnp/iof_mrhnp_component.c | 29 +++++----- orte/mca/iof/mr_orted/iof_mrorted_component.c | 28 +++++----- orte/mca/iof/orted/iof_orted_component.c | 26 ++++----- orte/mca/iof/tool/iof_tool_component.c | 24 +++++---- .../notifier/smtp/notifier_smtp_component.c | 31 ++++++----- .../syslog/notifier_syslog_component.c | 25 +++++---- orte/mca/odls/alps/odls_alps_component.c | 22 ++++---- .../mca/odls/default/odls_default_component.c | 22 ++++---- orte/mca/oob/alps/oob_alps_component.c | 54 ++++++++----------- orte/mca/oob/tcp/oob_tcp_component.c | 42 +++++++-------- orte/mca/oob/ud/oob_ud_component.c | 37 ++++++------- orte/mca/oob/usock/oob_usock_component.c | 38 +++++++------ orte/mca/plm/alps/plm_alps_component.c | 24 +++++---- .../mca/plm/isolated/plm_isolated_component.c | 23 ++++---- orte/mca/plm/lsf/plm_lsf_component.c | 22 ++++---- orte/mca/plm/rsh/plm_rsh_component.c | 36 ++++++------- orte/mca/plm/slurm/plm_slurm_component.c | 26 ++++----- orte/mca/plm/tm/plm_tm_component.c | 24 +++++---- orte/mca/ras/alps/ras_alps_component.c | 22 ++++---- .../ras/gridengine/ras_gridengine_component.c | 36 +++++++------ .../loadleveler/ras_loadleveler_component.c | 25 ++++----- orte/mca/ras/lsf/ras_lsf_component.c | 34 ++++++------ orte/mca/ras/simulator/ras_sim_component.c | 26 +++++---- orte/mca/ras/slurm/ras_slurm_component.c | 26 ++++----- orte/mca/ras/tm/ras_tm_component.c | 23 ++++---- orte/mca/rmaps/lama/rmaps_lama_component.c | 22 ++++---- .../rmaps/mindist/rmaps_mindist_component.c | 24 ++++----- orte/mca/rmaps/ppr/rmaps_ppr_component.c | 24 +++++---- .../rank_file/rmaps_rank_file_component.c | 24 +++++---- .../resilient/rmaps_resilient_component.c | 24 +++++---- .../rmaps/round_robin/rmaps_rr_component.c | 26 ++++----- orte/mca/rmaps/seq/rmaps_seq_component.c | 30 ++++++----- .../mca/rmaps/staged/rmaps_staged_component.c | 24 ++++----- orte/mca/rml/ftrm/rml_ftrm_component.c | 31 +++++------ orte/mca/rml/oob/rml_oob_component.c | 27 +++++----- .../binomial/routed_binomial_component.c | 32 ++++++----- .../debruijn/routed_debruijn_component.c | 25 ++++----- .../routed/direct/routed_direct_component.c | 26 +++++---- .../mca/routed/radix/routed_radix_component.c | 28 +++++----- orte/mca/rtc/freq/rtc_freq_component.c | 22 ++++---- orte/mca/rtc/hwloc/rtc_hwloc_component.c | 22 ++++---- orte/mca/schizo/ompi/schizo_ompi_component.c | 20 ++++--- orte/mca/snapc/full/snapc_full_component.c | 28 +++++----- .../sstore/central/sstore_central_component.c | 30 +++++------ .../mca/sstore/stage/sstore_stage_component.c | 28 +++++----- orte/mca/state/app/state_app_component.c | 24 ++++----- orte/mca/state/dvm/state_dvm_component.c | 20 +++---- orte/mca/state/hnp/state_hnp_component.c | 24 ++++----- orte/mca/state/novm/state_novm_component.c | 24 ++++----- orte/mca/state/orted/state_orted_component.c | 24 ++++----- .../staged_hnp/state_staged_hnp_component.c | 22 ++++---- .../state_staged_orted_component.c | 24 ++++----- orte/mca/state/tool/state_tool_component.c | 20 +++---- 74 files changed, 967 insertions(+), 954 deletions(-) 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 },