C99 component initialization

ompi/mca/bcol/basesmuma/bcol_basesmuma_component.c

@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2009-2012 Oak Ridge National Laboratory.  All rights reserved.
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
- * Copyright (c) 2014      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -76,33 +76,29 @@ mca_bcol_basesmuma_component_t mca_bcol_basesmuma_component = {
         /* First, the mca_component_t struct containing meta
            information about the component itself */
 
-        {
+        .bcol_version = {
             MCA_BCOL_BASE_VERSION_2_0_0,
 
             /* Component name and version */
 
-            "basesmuma",
-            OMPI_MAJOR_VERSION,
-            OMPI_MINOR_VERSION,
-            OMPI_RELEASE_VERSION,
+            .mca_component_name = "basesmuma",
+            MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,
+                                  OMPI_RELEASE_VERSION),
 
             /* Component open and close functions */
 
-            basesmuma_open,
-            basesmuma_close,
-            NULL,
-            basesmuma_register
+            .mca_open_component = basesmuma_open,
+            .mca_close_component = basesmuma_close,
+            .mca_register_component_params = basesmuma_register,
         },
 
         /* Initialization / querying functions */
 
-        mca_bcol_basesmuma_init_query,
-        mca_bcol_basesmuma_comm_query,
-        NULL,
-        NULL,
-        false,
-        false,
-        0, /* (default) priority */
+        .collm_init_query = mca_bcol_basesmuma_init_query,
+        .collm_comm_query = mca_bcol_basesmuma_comm_query,
+        .init_done = false,
+        .need_ordering = false,
+        .priority = 0, /* (default) priority */
     },
 };
 

ompi/mca/bcol/iboffload/bcol_iboffload_component.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2009-2012 Oak Ridge National Laboratory.  All rights reserved.
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
@@ -7,6 +8,8 @@
  *                         reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -94,25 +97,23 @@ mca_bcol_iboffload_component_t mca_bcol_iboffload_component = {
 
             /* Component name and version */
 
-            "iboffload",
-            OMPI_MAJOR_VERSION,
-            OMPI_MINOR_VERSION,
-            OMPI_RELEASE_VERSION,
+            .mca_component_name = "iboffload",
+            MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,
+                                  OMPI_RELEASE_VERSION),
 
             /* Component open and close functions */
 
-            iboffload_open,
-            iboffload_close,
-            NULL, /* query */
-            mca_bcol_iboffload_register_params,
+            .mca_open_component = iboffload_open,
+            .mca_close_component = iboffload_close,
+            .mca_register_component_params = mca_bcol_iboffload_register_params,
         },
 
-        mca_bcol_iboffload_init_query,
-        mca_bcol_iboffload_comm_query,
-        mca_bcol_iboffload_coll_supported,
-        mca_bcol_iboffload_coll_support_all_types,
-        false,
-        true, /* collective calls with iboffload should to be ordered */
+        .collm_init_query = mca_bcol_iboffload_init_query,
+        .collm_comm_query = mca_bcol_iboffload_comm_query,
+        .coll_support = mca_bcol_iboffload_coll_supported,
+        .coll_support_all_types = mca_bcol_iboffload_coll_support_all_types,
+        .init_done = false,
+        .need_ordering = true, /* collective calls with iboffload should to be ordered */
     },
     /* iboffload-component specifc information */
     .verbose = 0, /* verbose */

ompi/mca/bcol/ptpcoll/bcol_ptpcoll_component.c

@@ -58,31 +58,28 @@ mca_bcol_ptpcoll_component_t mca_bcol_ptpcoll_component = {
         /* First, the mca_component_t struct containing meta
            information about the component itself */
 
-        {
+        .bcol_version = {
             MCA_BCOL_BASE_VERSION_2_0_0,
 
             /* Component name and version */
 
-            "ptpcoll",
-            OMPI_MAJOR_VERSION,
-            OMPI_MINOR_VERSION,
-            OMPI_RELEASE_VERSION,
+            .mca_component_name = "ptpcoll",
+            MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,
+                                  OMPI_RELEASE_VERSION),
 
             /* Component open and close functions */
 
-            ptpcoll_open,
-            ptpcoll_close,
-	    .mca_register_component_params = mca_bcol_ptpcoll_register_mca_params
+            .mca_open_component = ptpcoll_open,
+            .mca_close_component = ptpcoll_close,
+	    .mca_register_component_params = mca_bcol_ptpcoll_register_mca_params,
         },
 
         /* Initialization / querying functions */
 
-        mca_bcol_ptpcoll_init_query,
-        mca_bcol_ptpcoll_comm_query,
-        NULL,
-        NULL,
-        false,
-        false,
+        .collm_init_query = mca_bcol_ptpcoll_init_query,
+        .collm_comm_query = mca_bcol_ptpcoll_comm_query,
+        .init_done = false,
+        .need_ordering = false,
     },
 
     /* component specific */

ompi/mca/bml/r2/bml_r2_component.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -10,6 +11,8 @@
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2010      Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -31,23 +34,21 @@ mca_bml_base_component_2_0_0_t mca_bml_r2_component = {
     /* First, the mca_base_component_t struct containing meta
        information about the component itself */
 
-    {
+    .bml_version = {
         MCA_BML_BASE_VERSION_2_0_0,
 
-        "r2", /* MCA component name */
-        OMPI_MAJOR_VERSION,  /* MCA component major version */
-        OMPI_MINOR_VERSION,  /* MCA component minor version */
-        OMPI_RELEASE_VERSION,  /* MCA component release version */
-        mca_bml_r2_component_open,  /* component open */
-        mca_bml_r2_component_close, /* component close */
-        NULL,
-        mca_bml_r2_component_register
+        .mca_component_name = "r2",
+        MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,
+                              OMPI_RELEASE_VERSION),
+        .mca_open_component = mca_bml_r2_component_open,
+        .mca_close_component = mca_bml_r2_component_close,
+        .mca_register_component_params = mca_bml_r2_component_register,
     },
-    {
+    .bml_data = {
         /* The component is checkpoint ready */
         MCA_BASE_METADATA_PARAM_CHECKPOINT
     },
-    mca_bml_r2_component_init
+    .bml_init = mca_bml_r2_component_init,
 };
 
 static int mca_bml_r2_component_register(void)

ompi/mca/coll/basic/coll_basic_component.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -10,6 +11,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -57,30 +60,26 @@ const mca_coll_base_component_2_0_0_t mca_coll_basic_component = {
     /* First, the mca_component_t struct containing meta information
      * about the component itself */
 
-    {
-     MCA_COLL_BASE_VERSION_2_0_0,
+    .collm_version = {
+        MCA_COLL_BASE_VERSION_2_0_0,
 
-     /* Component name and version */
-     "basic",
-     OMPI_MAJOR_VERSION,
-     OMPI_MINOR_VERSION,
-     OMPI_RELEASE_VERSION,
+        /* Component name and version */
+        .mca_component_name = "basic",
+        MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,
+                              OMPI_RELEASE_VERSION),
 
-     /* Component open and close functions */
-     NULL,
-     NULL,
-     NULL,
-     basic_register
+        /* Component open and close functions */
+        .mca_register_component_params = basic_register,
     },
-    {
+    .collm_data = {
         /* The component is checkpoint ready */
         MCA_BASE_METADATA_PARAM_CHECKPOINT
     },
 
     /* Initialization / querying functions */
 
-    mca_coll_basic_init_query,
-    mca_coll_basic_comm_query
+    .collm_init_query = mca_coll_basic_init_query,
+    .collm_comm_query = mca_coll_basic_comm_query,
 };
 
 

ompi/mca/coll/cuda/coll_cuda_component.c

@@ -1,8 +1,11 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2014      The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2014-2015 NVIDIA Corporation.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -39,30 +42,26 @@ mca_coll_cuda_component_t mca_coll_cuda_component = {
         /* First, the mca_component_t struct containing meta information
          * about the component itself */
 
-        {
+        .collm_version = {
             MCA_COLL_BASE_VERSION_2_0_0,
 
             /* Component name and version */
-            "cuda",
-            OMPI_MAJOR_VERSION,
-            OMPI_MINOR_VERSION,
-            OMPI_RELEASE_VERSION,
+            .mca_component_name = "cuda",
+            MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,
+                                  OMPI_RELEASE_VERSION),
 
             /* Component open and close functions */
-            NULL,
-            NULL,
-            NULL,
-            cuda_register
+            .mca_register_component_params = cuda_register,
         },
-        {
+        .collm_data = {
             /* The component is checkpoint ready */
             MCA_BASE_METADATA_PARAM_CHECKPOINT
         },
 
         /* Initialization / querying functions */
 
-        mca_coll_cuda_init_query,
-        mca_coll_cuda_comm_query
+        .collm_init_query = mca_coll_cuda_init_query,
+        .collm_comm_query = mca_coll_cuda_comm_query,
     },
 
     /* cuda-specific component information */

ompi/mca/coll/demo/coll_demo_component.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -10,6 +11,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -57,30 +60,26 @@ const mca_coll_base_component_2_0_0_t mca_coll_demo_component = {
     /* First, the mca_component_t struct containing meta information
        about the component itself */
 
-    {
+    .collm_version = {
         MCA_COLL_BASE_VERSION_2_0_0,
 
         /* Component name and version */
-        "demo",
-        OMPI_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        .mca_component_name = "demo",
+        MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,
+                              OMPI_RELEASE_VERSION),
 
         /* Component open and close functions */
-        NULL,
-        NULL,
-        NULL,
-        demo_register
+        .mca_register_component_params = demo_register,
     },
-    {
+    .collm_data = {
         /* The component is checkpoint ready */
         MCA_BASE_METADATA_PARAM_CHECKPOINT
     },
-    
+
     /* Initialization / querying functions */
-    
-    mca_coll_demo_init_query,
-    mca_coll_demo_comm_query
+
+    .collm_init_query = mca_coll_demo_init_query,
+    .collm_comm_query = mca_coll_demo_comm_query,
 };