shmem: use C99 struct initialization

Use .member=foo initialization for the shmem framework and components and modules.
2015-02-26 13:59:15 -08:00 · 2015-02-26 13:59:15 -08:00 · 62259a74f5
--- a/opal/mca/shmem/mmap/shmem_mmap_component.c
+++ b/opal/mca/shmem/mmap/shmem_mmap_component.c
@ -9,7 +9,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 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2015 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2010-2011 Los Alamos National Security, LLC.
 *                         All rights reserved.
 * $COPYRIGHT$
@ -57,37 +57,27 @@ static int mmap_runtime_query(mca_base_module_t **module,
 * and pointers to our public functions in it
 */
 opal_shmem_mmap_component_t mca_shmem_mmap_component = {
-    /* ////////////////////////////////////////////////////////////////////// */
-    /* super */
-    /* ////////////////////////////////////////////////////////////////////// */
-    {
-        /**
-         * common MCA component data
-         */
-        {
+    .super = {
+        .base_version = {
            OPAL_SHMEM_BASE_VERSION_2_0_0,

            /* component name and version */
-            "mmap",
-            OPAL_MAJOR_VERSION,
-            OPAL_MINOR_VERSION,
-            OPAL_RELEASE_VERSION,
+            .mca_component_name = "mmap",
+            .mca_component_major_version = OPAL_MAJOR_VERSION,
+            .mca_component_minor_version = OPAL_MINOR_VERSION,
+            .mca_component_release_version = OPAL_RELEASE_VERSION,

-            /* component open */
-            mmap_open,
-            /* component close */
-            mmap_close,
-            /* component query */
-            mmap_query,
-            /* component register */
-            mmap_register
+            .mca_open_component = mmap_open,
+            .mca_close_component = mmap_close,
+            .mca_query_component = mmap_query,
+            .mca_register_component_params = mmap_register,
        },
        /* MCA v2.0.0 component meta data */
-        {
+        .base_data = {
            /* the component is checkpoint ready */
            MCA_BASE_METADATA_PARAM_CHECKPOINT
        },
-        mmap_runtime_query,
+        .runtime_query = mmap_runtime_query,
    },
 };

--- a/opal/mca/shmem/mmap/shmem_mmap_module.c
+++ b/opal/mca/shmem/mmap/shmem_mmap_module.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) 2007-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2015 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 * Copyright (c) 2010-2014 Los Alamos National Security, LLC.
 *                         All rights reserved.
@ -100,15 +100,14 @@ enough_space(const char *filename,
 * mmap shmem module
 */
 opal_shmem_mmap_module_t opal_shmem_mmap_module = {
-    /* super */
-    {
-        module_init,
-        segment_create,
-        ds_copy,
-        segment_attach,
-        segment_detach,
-        segment_unlink,
-        module_finalize
+    .super = {
+        .module_init = module_init,
+        .segment_create = segment_create,
+        .ds_copy = ds_copy,
+        .segment_attach = segment_attach,
+        .segment_detach = segment_detach,
+        .unlink = segment_unlink,
+        .module_finalize = module_finalize
    }
 };

--- a/opal/mca/shmem/posix/shmem_posix_component.c
+++ b/opal/mca/shmem/posix/shmem_posix_component.c
@ -9,7 +9,7 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
- * Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2015 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2010-2011 Los Alamos National Security, LLC.
 *                         All rights reserved.
 * Copyright (c) 2011      NVIDIA Corporation.  All rights reserved.
@ -70,38 +70,27 @@ static bool rt_successful = false;
 * and pointers to our public functions in it
 */
 opal_shmem_posix_component_t mca_shmem_posix_component = {
-    /* ////////////////////////////////////////////////////////////////////// */
-    /* super */
-    /* ////////////////////////////////////////////////////////////////////// */
-    {
-        /* common MCA component data */
-        {
+    .super = {
+        .base_version = {
            OPAL_SHMEM_BASE_VERSION_2_0_0,

            /* component name and version */
-            "posix",
-            OPAL_MAJOR_VERSION,
-            OPAL_MINOR_VERSION,
-            OPAL_RELEASE_VERSION,
+            .mca_component_name = "posix",
+            .mca_component_major_version = OPAL_MAJOR_VERSION,
+            .mca_component_minor_version = OPAL_MINOR_VERSION,
+            .mca_component_release_version = OPAL_RELEASE_VERSION,

-            /* component open */
-            posix_open,
-            /* component close */
-            NULL,
-            /* component query */
-            posix_query,
-            posix_register
+            .mca_open_component = posix_open,
+            .mca_query_component = posix_query,
+            .mca_register_component_params = posix_register
        },
        /* MCA v2.0.0 component meta data */
-        {
+        .base_data = {
            /* the component is checkpoint ready */
            MCA_BASE_METADATA_PARAM_CHECKPOINT
        },
-        posix_runtime_query,
+        .runtime_query = posix_runtime_query,
    },
-    /* ////////////////////////////////////////////////////////////////////// */
-    /* posix component-specific information */
-    /* see: shmem_posix.h for more information */
 };


--- a/opal/mca/shmem/posix/shmem_posix_module.c
+++ b/opal/mca/shmem/posix/shmem_posix_module.c
@ -9,7 +9,7 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
- * Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2015 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 * Copyright (c) 2010-2012 Los Alamos National Security, LLC.
 *                         All rights reserved.
@ -90,15 +90,14 @@ module_finalize(void);

 /* posix shmem module */
 opal_shmem_posix_module_t opal_shmem_posix_module = {
-    /* super */
-    {
-        module_init,
-        segment_create,
-        ds_copy,
-        segment_attach,
-        segment_detach,
-        segment_unlink,
-        module_finalize
+    .super = {
+        .module_init = module_init,
+        .segment_create = segment_create,
+        .ds_copy = ds_copy,
+        .segment_attach = segment_attach,
+        .segment_detach = segment_detach,
+        .unlink = segment_unlink,
+        .module_finalize = module_finalize
    }
 };

--- a/opal/mca/shmem/shmem.h
+++ b/opal/mca/shmem/shmem.h
@ -9,7 +9,7 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
- * Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2015 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
 * Copyright (c) 2010      IBM Corporation.  All rights reserved.
 * Copyright (c) 2010-2011 Los Alamos National Security, LLC.
@ -180,9 +180,12 @@ typedef struct opal_shmem_base_module_2_0_0_t opal_shmem_base_module_t;
 * macro for use in components that are of type shmem
 * see: opal/mca/mca.h for more information
 */
-#define OPAL_SHMEM_BASE_VERSION_2_0_0                                          \
-    MCA_BASE_VERSION_2_0_0,                                                    \
-    "shmem", 2, 0, 0
+#define OPAL_SHMEM_BASE_VERSION_2_0_0                                   \
+    MCA_BASE_VERSION_2_0_0,                                             \
+        .mca_type_name = "shmem",                                       \
+        .mca_type_major_version = 2,                                    \
+        .mca_type_minor_version = 0,                                    \
+        .mca_type_release_version = 0

 END_C_DECLS

--- a/opal/mca/shmem/sysv/shmem_sysv_component.c
+++ b/opal/mca/shmem/sysv/shmem_sysv_component.c
@ -74,38 +74,28 @@ static int sysv_runtime_query(mca_base_module_t **module,
 * and pointers to our public functions in it
 */
 opal_shmem_sysv_component_t mca_shmem_sysv_component = {
-    /* ////////////////////////////////////////////////////////////////////// */
-    /* super */
-    /* ////////////////////////////////////////////////////////////////////// */
-    {
+    .super = {
        /* common MCA component data */
        {
            OPAL_SHMEM_BASE_VERSION_2_0_0,

            /* component name and version */
-            "sysv",
-            OPAL_MAJOR_VERSION,
-            OPAL_MINOR_VERSION,
-            OPAL_RELEASE_VERSION,
+            .mca_component_name = "sysv",
+            .mca_component_major_version = OPAL_MAJOR_VERSION,
+            .mca_component_minor_version = OPAL_MINOR_VERSION,
+            .mca_component_release_version = OPAL_RELEASE_VERSION,

-            /* component open */
-            sysv_open,
-            /* component close */
-            NULL,
-            /* component query */
-            sysv_query,
-            sysv_register
+            .mca_open_component = sysv_open,
+            .mca_query_component = sysv_query,
+            .mca_register_component_params = sysv_register
        },
        /* MCA v2.0.0 component meta data */
-        {
+        .base_data = {
            /* the component is checkpoint ready */
            MCA_BASE_METADATA_PARAM_CHECKPOINT
        },
-        sysv_runtime_query,
+        .runtime_query = sysv_runtime_query,
    },
-    /* ////////////////////////////////////////////////////////////////////// */
-    /* sysv component-specific information */
-    /* see: shmem_sysv.h for more information */
 };

 /* ////////////////////////////////////////////////////////////////////////// */
--- a/opal/mca/shmem/sysv/shmem_sysv_module.c
+++ b/opal/mca/shmem/sysv/shmem_sysv_module.c
@ -9,7 +9,7 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
- * Copyright (c) 2007-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2015 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 * Copyright (c) 2010-2012 Los Alamos National Security, LLC.
 *                         All rights reserved.
@ -92,15 +92,14 @@ module_finalize(void);

 /* sysv shmem module */
 opal_shmem_sysv_module_t opal_shmem_sysv_module = {
-    /* super */
-    {
-        module_init,
-        segment_create,
-        ds_copy,
-        segment_attach,
-        segment_detach,
-        segment_unlink,
-        module_finalize
+    .super = {
+        .module_init = module_init,
+        .segment_create = segment_create,
+        .ds_copy = ds_copy,
+        .segment_attach = segment_attach,
+        .segment_detach = segment_detach,
+        .unlink = segment_unlink,
+        .module_finalize = module_finalize
    }
 };