From 9d56b85b5554e970a31dd03f6bf0af6100239ade Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 8 May 2015 09:19:02 +0900 Subject: [PATCH] initialize common symbols from ompi --- ompi/communicator/comm_init.c | 14 +- ompi/communicator/comm_request.c | 2 + ompi/datatype/ompi_datatype_module.c | 4 +- ompi/debuggers/ompi_common_dll.c | 4 +- ompi/errhandler/errcode-internal.c | 4 +- ompi/errhandler/errcode.c | 150 +++++++++--------- ompi/errhandler/errhandler.c | 12 +- ompi/file/file.c | 6 +- ompi/group/group_init.c | 8 +- ompi/info/info.c | 8 +- ompi/mca/bcol/base/bcol_base_frame.c | 8 +- ompi/mca/bml/base/bml_base_init.c | 4 +- ompi/mca/coll/tuned/coll_tuned_component.c | 6 +- ompi/mca/crcp/base/crcp_base_frame.c | 4 +- ompi/mca/dpm/base/dpm_base_frame.c | 4 +- ompi/mca/fbtl/base/fbtl_base_frame.c | 6 +- ompi/mca/io/ompio/io_ompio_component.c | 6 +- .../io/romio314/src/io_romio314_component.c | 2 +- ompi/mca/osc/pt2pt/osc_pt2pt_component.c | 4 +- ompi/mca/pml/base/pml_base_frame.c | 8 +- ompi/mca/sbgp/base/sbgp_base_frame.c | 6 +- ompi/mca/sharedfp/base/sharedfp_base_frame.c | 4 +- ompi/mca/vprotocol/base/vprotocol_base.c | 4 +- .../vprotocol/base/vprotocol_base_select.c | 4 +- ompi/message/message.c | 12 +- ompi/mpi/tool/mpit_common.c | 4 +- ompi/op/op.c | 36 +++-- ompi/request/request.c | 14 +- ompi/runtime/ompi_mpi_init.c | 40 ++--- ompi/win/win.c | 6 +- 30 files changed, 223 insertions(+), 171 deletions(-) diff --git a/ompi/communicator/comm_init.c b/ompi/communicator/comm_init.c index 19e63a7ee7..d7980cb324 100644 --- a/ompi/communicator/comm_init.c +++ b/ompi/communicator/comm_init.c @@ -18,6 +18,8 @@ * Copyright (c) 2011-2013 Inria. All rights reserved. * Copyright (c) 2011-2013 Universite Bordeaux 1 * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -46,13 +48,13 @@ ** on cid. ** */ -opal_pointer_array_t ompi_mpi_communicators; -opal_pointer_array_t ompi_comm_f_to_c_table; +opal_pointer_array_t ompi_mpi_communicators = {{0}}; +opal_pointer_array_t ompi_comm_f_to_c_table = {{0}}; -ompi_predefined_communicator_t ompi_mpi_comm_world; -ompi_predefined_communicator_t ompi_mpi_comm_self; -ompi_predefined_communicator_t ompi_mpi_comm_null; -ompi_communicator_t *ompi_mpi_comm_parent; +ompi_predefined_communicator_t ompi_mpi_comm_world = {{{0}}}; +ompi_predefined_communicator_t ompi_mpi_comm_self = {{{0}}}; +ompi_predefined_communicator_t ompi_mpi_comm_null = {{{0}}}; +ompi_communicator_t *ompi_mpi_comm_parent = NULL; ompi_predefined_communicator_t *ompi_mpi_comm_world_addr = &ompi_mpi_comm_world; diff --git a/ompi/communicator/comm_request.c b/ompi/communicator/comm_request.c index 04be3e33fc..14c57c16b5 100644 --- a/ompi/communicator/comm_request.c +++ b/ompi/communicator/comm_request.c @@ -2,6 +2,8 @@ /* * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reseved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/datatype/ompi_datatype_module.c b/ompi/datatype/ompi_datatype_module.c index a9d5b68d76..85d092067d 100644 --- a/ompi/datatype/ompi_datatype_module.c +++ b/ompi/datatype/ompi_datatype_module.c @@ -15,6 +15,8 @@ * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -366,7 +368,7 @@ const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX_PREDEF [OMPI_DATATYPE_MPI_UNAVAILABLE] = &ompi_mpi_unavailable.dt, }; -opal_pointer_array_t ompi_datatype_f_to_c_table; +opal_pointer_array_t ompi_datatype_f_to_c_table = {{0}}; #define COPY_DATA_DESC( PDST, PSRC ) \ do { \ diff --git a/ompi/debuggers/ompi_common_dll.c b/ompi/debuggers/ompi_common_dll.c index 4a9930df0a..9188322b7d 100644 --- a/ompi/debuggers/ompi_common_dll.c +++ b/ompi/debuggers/ompi_common_dll.c @@ -6,7 +6,7 @@ * reserved. * Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights @@ -45,7 +45,7 @@ #include "ompi_common_dll_defs.h" /* Basic callbacks into the debugger */ -const mqs_basic_callbacks *mqs_basic_entrypoints; +const mqs_basic_callbacks *mqs_basic_entrypoints = NULL; #if defined(WORDS_BIGENDIAN) static int host_is_big_endian = 1; diff --git a/ompi/errhandler/errcode-internal.c b/ompi/errhandler/errcode-internal.c index 8972b850b6..8a6fb8a3d8 100644 --- a/ompi/errhandler/errcode-internal.c +++ b/ompi/errhandler/errcode-internal.c @@ -10,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 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,7 +28,7 @@ #include "ompi/errhandler/errcode-internal.h" /* Table holding all error codes */ -opal_pointer_array_t ompi_errcodes_intern; +opal_pointer_array_t ompi_errcodes_intern = {{0}}; int ompi_errcode_intern_lastused=0; static ompi_errcode_intern_t ompi_success_intern; diff --git a/ompi/errhandler/errcode.c b/ompi/errhandler/errcode.c index 8661bc35d1..f3733603a6 100644 --- a/ompi/errhandler/errcode.c +++ b/ompi/errhandler/errcode.c @@ -14,6 +14,8 @@ * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -34,84 +36,84 @@ #include "ompi/constants.h" /* Table holding all error codes */ -opal_pointer_array_t ompi_mpi_errcodes; +opal_pointer_array_t ompi_mpi_errcodes = {{0}}; int ompi_mpi_errcode_lastused=0; int ompi_mpi_errcode_lastpredefined=0; -ompi_mpi_errcode_t ompi_success; -ompi_mpi_errcode_t ompi_err_buffer; -ompi_mpi_errcode_t ompi_err_count; -ompi_mpi_errcode_t ompi_err_type; -ompi_mpi_errcode_t ompi_err_tag; -ompi_mpi_errcode_t ompi_err_comm; -ompi_mpi_errcode_t ompi_err_rank; -ompi_mpi_errcode_t ompi_err_request; -ompi_mpi_errcode_t ompi_err_root; -ompi_mpi_errcode_t ompi_err_group; -ompi_mpi_errcode_t ompi_err_op; -ompi_mpi_errcode_t ompi_err_topology; -ompi_mpi_errcode_t ompi_err_dims; -ompi_mpi_errcode_t ompi_err_arg; -ompi_mpi_errcode_t ompi_err_unknown; -ompi_mpi_errcode_t ompi_err_truncate; -ompi_mpi_errcode_t ompi_err_other; -ompi_mpi_errcode_t ompi_err_intern; -ompi_mpi_errcode_t ompi_err_in_status; -ompi_mpi_errcode_t ompi_err_pending; +ompi_mpi_errcode_t ompi_success = {{0}}; +ompi_mpi_errcode_t ompi_err_buffer = {{0}}; +ompi_mpi_errcode_t ompi_err_count = {{0}}; +ompi_mpi_errcode_t ompi_err_type = {{0}}; +ompi_mpi_errcode_t ompi_err_tag = {{0}}; +ompi_mpi_errcode_t ompi_err_comm = {{0}}; +ompi_mpi_errcode_t ompi_err_rank = {{0}}; +ompi_mpi_errcode_t ompi_err_request = {{0}}; +ompi_mpi_errcode_t ompi_err_root = {{0}}; +ompi_mpi_errcode_t ompi_err_group = {{0}}; +ompi_mpi_errcode_t ompi_err_op = {{0}}; +ompi_mpi_errcode_t ompi_err_topology = {{0}}; +ompi_mpi_errcode_t ompi_err_dims = {{0}}; +ompi_mpi_errcode_t ompi_err_arg = {{0}}; +ompi_mpi_errcode_t ompi_err_unknown = {{0}}; +ompi_mpi_errcode_t ompi_err_truncate = {{0}}; +ompi_mpi_errcode_t ompi_err_other = {{0}}; +ompi_mpi_errcode_t ompi_err_intern = {{0}}; +ompi_mpi_errcode_t ompi_err_in_status = {{0}}; +ompi_mpi_errcode_t ompi_err_pending = {{0}}; -ompi_mpi_errcode_t ompi_err_access; -ompi_mpi_errcode_t ompi_err_amode; -ompi_mpi_errcode_t ompi_err_assert; -ompi_mpi_errcode_t ompi_err_bad_file; -ompi_mpi_errcode_t ompi_err_base; -ompi_mpi_errcode_t ompi_err_conversion; -ompi_mpi_errcode_t ompi_err_disp; -ompi_mpi_errcode_t ompi_err_dup_datarep; -ompi_mpi_errcode_t ompi_err_file_exists; -ompi_mpi_errcode_t ompi_err_file_in_use; -ompi_mpi_errcode_t ompi_err_file; -ompi_mpi_errcode_t ompi_err_info_key; -ompi_mpi_errcode_t ompi_err_info_nokey; -ompi_mpi_errcode_t ompi_err_info_value; -ompi_mpi_errcode_t ompi_err_info; -ompi_mpi_errcode_t ompi_err_io; -ompi_mpi_errcode_t ompi_err_keyval; -ompi_mpi_errcode_t ompi_err_locktype; -ompi_mpi_errcode_t ompi_err_name; -ompi_mpi_errcode_t ompi_err_no_mem; -ompi_mpi_errcode_t ompi_err_not_same; -ompi_mpi_errcode_t ompi_err_no_space; -ompi_mpi_errcode_t ompi_err_no_such_file; -ompi_mpi_errcode_t ompi_err_port; -ompi_mpi_errcode_t ompi_err_quota; -ompi_mpi_errcode_t ompi_err_read_only; -ompi_mpi_errcode_t ompi_err_rma_conflict; -ompi_mpi_errcode_t ompi_err_rma_sync; -ompi_mpi_errcode_t ompi_err_service; -ompi_mpi_errcode_t ompi_err_size; -ompi_mpi_errcode_t ompi_err_spawn; -ompi_mpi_errcode_t ompi_err_unsupported_datarep; -ompi_mpi_errcode_t ompi_err_unsupported_operation; -ompi_mpi_errcode_t ompi_err_win; -ompi_mpi_errcode_t ompi_t_err_memory; -ompi_mpi_errcode_t ompi_t_err_not_initialized; -ompi_mpi_errcode_t ompi_t_err_cannot_init; -ompi_mpi_errcode_t ompi_t_err_invalid_index; -ompi_mpi_errcode_t ompi_t_err_invalid_item; -ompi_mpi_errcode_t ompi_t_err_invalid_handle; -ompi_mpi_errcode_t ompi_t_err_out_of_handles; -ompi_mpi_errcode_t ompi_t_err_out_of_sessions; -ompi_mpi_errcode_t ompi_t_err_invalid_session; -ompi_mpi_errcode_t ompi_t_err_cvar_set_not_now; -ompi_mpi_errcode_t ompi_t_err_cvar_set_never; -ompi_mpi_errcode_t ompi_t_err_pvar_no_startstop; -ompi_mpi_errcode_t ompi_t_err_pvar_no_write; -ompi_mpi_errcode_t ompi_t_err_pvar_no_atomic; -ompi_mpi_errcode_t ompi_err_rma_range; -ompi_mpi_errcode_t ompi_err_rma_attach; -ompi_mpi_errcode_t ompi_err_rma_flavor; -ompi_mpi_errcode_t ompi_err_rma_shared; -ompi_mpi_errcode_t ompi_t_err_invalid; +ompi_mpi_errcode_t ompi_err_access = {{0}}; +ompi_mpi_errcode_t ompi_err_amode = {{0}}; +ompi_mpi_errcode_t ompi_err_assert = {{0}}; +ompi_mpi_errcode_t ompi_err_bad_file = {{0}}; +ompi_mpi_errcode_t ompi_err_base = {{0}}; +ompi_mpi_errcode_t ompi_err_conversion = {{0}}; +ompi_mpi_errcode_t ompi_err_disp = {{0}}; +ompi_mpi_errcode_t ompi_err_dup_datarep = {{0}}; +ompi_mpi_errcode_t ompi_err_file_exists = {{0}}; +ompi_mpi_errcode_t ompi_err_file_in_use = {{0}}; +ompi_mpi_errcode_t ompi_err_file = {{0}}; +ompi_mpi_errcode_t ompi_err_info_key = {{0}}; +ompi_mpi_errcode_t ompi_err_info_nokey = {{0}}; +ompi_mpi_errcode_t ompi_err_info_value = {{0}}; +ompi_mpi_errcode_t ompi_err_info = {{0}}; +ompi_mpi_errcode_t ompi_err_io = {{0}}; +ompi_mpi_errcode_t ompi_err_keyval = {{0}}; +ompi_mpi_errcode_t ompi_err_locktype = {{0}}; +ompi_mpi_errcode_t ompi_err_name = {{0}}; +ompi_mpi_errcode_t ompi_err_no_mem = {{0}}; +ompi_mpi_errcode_t ompi_err_not_same = {{0}}; +ompi_mpi_errcode_t ompi_err_no_space = {{0}}; +ompi_mpi_errcode_t ompi_err_no_such_file = {{0}}; +ompi_mpi_errcode_t ompi_err_port = {{0}}; +ompi_mpi_errcode_t ompi_err_quota = {{0}}; +ompi_mpi_errcode_t ompi_err_read_only = {{0}}; +ompi_mpi_errcode_t ompi_err_rma_conflict = {{0}}; +ompi_mpi_errcode_t ompi_err_rma_sync = {{0}}; +ompi_mpi_errcode_t ompi_err_service = {{0}}; +ompi_mpi_errcode_t ompi_err_size = {{0}}; +ompi_mpi_errcode_t ompi_err_spawn = {{0}}; +ompi_mpi_errcode_t ompi_err_unsupported_datarep = {{0}}; +ompi_mpi_errcode_t ompi_err_unsupported_operation = {{0}}; +ompi_mpi_errcode_t ompi_err_win = {{0}}; +ompi_mpi_errcode_t ompi_t_err_memory = {{0}}; +ompi_mpi_errcode_t ompi_t_err_not_initialized = {{0}}; +ompi_mpi_errcode_t ompi_t_err_cannot_init = {{0}}; +ompi_mpi_errcode_t ompi_t_err_invalid_index = {{0}}; +ompi_mpi_errcode_t ompi_t_err_invalid_item = {{0}}; +ompi_mpi_errcode_t ompi_t_err_invalid_handle = {{0}}; +ompi_mpi_errcode_t ompi_t_err_out_of_handles = {{0}}; +ompi_mpi_errcode_t ompi_t_err_out_of_sessions = {{0}}; +ompi_mpi_errcode_t ompi_t_err_invalid_session = {{0}}; +ompi_mpi_errcode_t ompi_t_err_cvar_set_not_now = {{0}}; +ompi_mpi_errcode_t ompi_t_err_cvar_set_never = {{0}}; +ompi_mpi_errcode_t ompi_t_err_pvar_no_startstop = {{0}}; +ompi_mpi_errcode_t ompi_t_err_pvar_no_write = {{0}}; +ompi_mpi_errcode_t ompi_t_err_pvar_no_atomic = {{0}}; +ompi_mpi_errcode_t ompi_err_rma_range = {{0}}; +ompi_mpi_errcode_t ompi_err_rma_attach = {{0}}; +ompi_mpi_errcode_t ompi_err_rma_flavor = {{0}}; +ompi_mpi_errcode_t ompi_err_rma_shared = {{0}}; +ompi_mpi_errcode_t ompi_t_err_invalid = {{0}}; static void ompi_mpi_errcode_construct(ompi_mpi_errcode_t* errcode); static void ompi_mpi_errcode_destruct(ompi_mpi_errcode_t* errcode); diff --git a/ompi/errhandler/errhandler.c b/ompi/errhandler/errhandler.c index b0d8b45902..54eaf5aebb 100644 --- a/ompi/errhandler/errhandler.c +++ b/ompi/errhandler/errhandler.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,7 +37,7 @@ /* * Table for Fortran <-> C errhandler handle conversion */ -opal_pointer_array_t ompi_errhandler_f_to_c_table; +opal_pointer_array_t ompi_errhandler_f_to_c_table = {{0}}; /* @@ -55,16 +57,16 @@ OBJ_CLASS_INSTANCE(ompi_errhandler_t, opal_object_t, ompi_errhandler_construct, /* * _addr flavors are for F03 bindings */ -ompi_predefined_errhandler_t ompi_mpi_errhandler_null; +ompi_predefined_errhandler_t ompi_mpi_errhandler_null = {{{0}}}; ompi_predefined_errhandler_t *ompi_mpi_errhandler_null_addr = &ompi_mpi_errhandler_null; -ompi_predefined_errhandler_t ompi_mpi_errors_are_fatal; +ompi_predefined_errhandler_t ompi_mpi_errors_are_fatal = {{{0}}}; ompi_predefined_errhandler_t *ompi_mpi_errors_are_fatal_addr = &ompi_mpi_errors_are_fatal; -ompi_predefined_errhandler_t ompi_mpi_errors_return; +ompi_predefined_errhandler_t ompi_mpi_errors_return = {{{0}}}; ompi_predefined_errhandler_t *ompi_mpi_errors_return_addr = &ompi_mpi_errors_return; -ompi_predefined_errhandler_t ompi_mpi_errors_throw_exceptions; +ompi_predefined_errhandler_t ompi_mpi_errors_throw_exceptions = {{{0}}}; ompi_predefined_errhandler_t *ompi_mpi_errors_throw_exceptions_addr = &ompi_mpi_errors_throw_exceptions; diff --git a/ompi/file/file.c b/ompi/file/file.c index bbf8380999..891d51a64e 100644 --- a/ompi/file/file.c +++ b/ompi/file/file.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,12 +34,12 @@ /* * Table for Fortran <-> C file handle conversion */ -opal_pointer_array_t ompi_file_f_to_c_table; +opal_pointer_array_t ompi_file_f_to_c_table = {{0}}; /* * MPI_FILE_NULL (_addr flavor is for F03 bindings) */ -ompi_predefined_file_t ompi_mpi_file_null; +ompi_predefined_file_t ompi_mpi_file_null = {{{0}}}; ompi_predefined_file_t *ompi_mpi_file_null_addr = &ompi_mpi_file_null; diff --git a/ompi/group/group_init.c b/ompi/group/group_init.c index 260fbd0380..5ef2b1f3d7 100644 --- a/ompi/group/group_init.c +++ b/ompi/group/group_init.c @@ -14,6 +14,8 @@ * Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2012 Oak Ridge National Labs. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,13 +40,13 @@ OBJ_CLASS_INSTANCE(ompi_group_t, /* * Table for Fortran <-> C group handle conversion */ -opal_pointer_array_t ompi_group_f_to_c_table; +opal_pointer_array_t ompi_group_f_to_c_table = {{0}}; /* * Predefined group objects */ -ompi_predefined_group_t ompi_mpi_group_empty; -ompi_predefined_group_t ompi_mpi_group_null; +ompi_predefined_group_t ompi_mpi_group_empty = {{{0}}}; +ompi_predefined_group_t ompi_mpi_group_null = {{{0}}}; ompi_predefined_group_t *ompi_mpi_group_empty_addr = &ompi_mpi_group_empty; ompi_predefined_group_t *ompi_mpi_group_null_addr = &ompi_mpi_group_null; diff --git a/ompi/info/info.c b/ompi/info/info.c index b44f3c76a9..fded842fa7 100644 --- a/ompi/info/info.c +++ b/ompi/info/info.c @@ -14,6 +14,8 @@ * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -54,9 +56,9 @@ /* * Global variables */ -ompi_predefined_info_t ompi_mpi_info_null; +ompi_predefined_info_t ompi_mpi_info_null = {{{{0}}}}; ompi_predefined_info_t *ompi_mpi_info_null_addr = &ompi_mpi_info_null; -ompi_predefined_info_t ompi_mpi_info_env; +ompi_predefined_info_t ompi_mpi_info_env = {{{{0}}}}; /* @@ -88,7 +90,7 @@ OBJ_CLASS_INSTANCE(ompi_info_entry_t, /* * The global fortran <-> C translation table */ -opal_pointer_array_t ompi_info_f_to_c_table; +opal_pointer_array_t ompi_info_f_to_c_table = {{0}}; /* * This function is called during ompi_init and initializes the diff --git a/ompi/mca/bcol/base/bcol_base_frame.c b/ompi/mca/bcol/base/bcol_base_frame.c index 75e42d0bd6..af9c42a749 100644 --- a/ompi/mca/bcol/base/bcol_base_frame.c +++ b/ompi/mca/bcol/base/bcol_base_frame.c @@ -49,10 +49,10 @@ static int mca_bcol_base_register(mca_base_register_flag_t flags); MCA_BASE_FRAMEWORK_DECLARE(ompi, bcol, NULL, mca_bcol_base_register, mca_bcol_base_open, mca_bcol_base_close, mca_bcol_base_static_components, 0); -OMPI_DECLSPEC opal_list_t mca_bcol_base_components_in_use; -OMPI_DECLSPEC char *ompi_bcol_bcols_string; -OMPI_DECLSPEC int bcol_mpool_compatibility[BCOL_SIZE][BCOL_SIZE]; -OMPI_DECLSPEC int bcol_mpool_index[BCOL_SIZE][BCOL_SIZE]; +OMPI_DECLSPEC opal_list_t mca_bcol_base_components_in_use = {{0}}; +OMPI_DECLSPEC char *ompi_bcol_bcols_string = NULL; +OMPI_DECLSPEC int bcol_mpool_compatibility[BCOL_SIZE][BCOL_SIZE] = {{0}}; +OMPI_DECLSPEC int bcol_mpool_index[BCOL_SIZE][BCOL_SIZE] = {{0}}; static void bcol_base_module_constructor(mca_bcol_base_module_t *module) { diff --git a/ompi/mca/bml/base/bml_base_init.c b/ompi/mca/bml/base/bml_base_init.c index 28da48afcd..66eb0c55ef 100644 --- a/ompi/mca/bml/base/bml_base_init.c +++ b/ompi/mca/bml/base/bml_base_init.c @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,7 +37,7 @@ mca_bml_base_module_t mca_bml = { NULL, /* bml_finalize*/ NULL /* FT event */ }; -mca_bml_base_component_t mca_bml_component; +mca_bml_base_component_t mca_bml_component = {{0}}; static bool init_called = false; diff --git a/ompi/mca/coll/tuned/coll_tuned_component.c b/ompi/mca/coll/tuned/coll_tuned_component.c index 010d86364e..409e65c0b9 100644 --- a/ompi/mca/coll/tuned/coll_tuned_component.c +++ b/ompi/mca/coll/tuned/coll_tuned_component.c @@ -14,6 +14,8 @@ * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -57,9 +59,9 @@ int ompi_coll_tuned_alltoall_intermediate_msg = 3000; /* forced alogrithm variables */ /* indices for the MCA parameters */ -coll_tuned_force_algorithm_mca_param_indices_t ompi_coll_tuned_forced_params[COLLCOUNT]; +coll_tuned_force_algorithm_mca_param_indices_t ompi_coll_tuned_forced_params[COLLCOUNT] = {{0}}; /* max algorithm values */ -int ompi_coll_tuned_forced_max_algorithms[COLLCOUNT]; +int ompi_coll_tuned_forced_max_algorithms[COLLCOUNT] = {0}; /* * Local function diff --git a/ompi/mca/crcp/base/crcp_base_frame.c b/ompi/mca/crcp/base/crcp_base_frame.c index e8184dda5b..87cc386424 100644 --- a/ompi/mca/crcp/base/crcp_base_frame.c +++ b/ompi/mca/crcp/base/crcp_base_frame.c @@ -7,6 +7,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,7 +35,7 @@ OMPI_DECLSPEC ompi_crcp_base_module_t ompi_crcp = { NULL /* crcp_finalize */ }; -ompi_crcp_base_component_t ompi_crcp_base_selected_component; +ompi_crcp_base_component_t ompi_crcp_base_selected_component = {{0}}; static int ompi_crcp_base_close(void) { diff --git a/ompi/mca/dpm/base/dpm_base_frame.c b/ompi/mca/dpm/base/dpm_base_frame.c index cc5fefa3d9..041987dade 100644 --- a/ompi/mca/dpm/base/dpm_base_frame.c +++ b/ompi/mca/dpm/base/dpm_base_frame.c @@ -11,6 +11,8 @@ * Copyright (c) 2013 Intel, Inc. All rights reserved * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -49,7 +51,7 @@ OMPI_DECLSPEC ompi_dpm_base_module_t ompi_dpm = { ompi_dpm_base_null_paccept, ompi_dpm_base_null_pclose }; -ompi_dpm_base_component_t ompi_dpm_base_selected_component; +ompi_dpm_base_component_t ompi_dpm_base_selected_component = {{0}}; static int ompi_dpm_base_close(void) { diff --git a/ompi/mca/fbtl/base/fbtl_base_frame.c b/ompi/mca/fbtl/base/fbtl_base_frame.c index a649aa86a3..69669225d7 100644 --- a/ompi/mca/fbtl/base/fbtl_base_frame.c +++ b/ompi/mca/fbtl/base/fbtl_base_frame.c @@ -13,6 +13,8 @@ * Copyright (c) 2008-2011 University of Houston. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -41,8 +43,8 @@ * Global variables; most of which are loaded by back-ends of MCA * variables */ -mca_fbtl_base_component_t mca_fbtl_base_selected_component; -mca_fbtl_base_module_t mca_fbtl; +mca_fbtl_base_component_t mca_fbtl_base_selected_component = {{0}}; +mca_fbtl_base_module_t mca_fbtl = {0}; MCA_BASE_FRAMEWORK_DECLARE(ompi, fbtl, NULL, NULL, NULL, NULL, mca_fbtl_base_static_components, 0); diff --git a/ompi/mca/io/ompio/io_ompio_component.c b/ompi/mca/io/ompio/io_ompio_component.c index 6da3a9bb1b..b1f862bf86 100644 --- a/ompi/mca/io/ompio/io_ompio_component.c +++ b/ompi/mca/io/ompio/io_ompio_component.c @@ -13,6 +13,8 @@ * Copyright (c) 2008-2014 University of Houston. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -79,13 +81,13 @@ static int delete_priority_param = 30; /* * Global, component-wide OMPIO mutex because OMPIO is not thread safe */ -opal_mutex_t mca_io_ompio_mutex; +opal_mutex_t mca_io_ompio_mutex = {{0}}; /* * Global list of requests for this component */ -opal_list_t mca_io_ompio_pending_requests; +opal_list_t mca_io_ompio_pending_requests = {{0}}; /* diff --git a/ompi/mca/io/romio314/src/io_romio314_component.c b/ompi/mca/io/romio314/src/io_romio314_component.c index f9b6a8ebdd..329f73767f 100644 --- a/ompi/mca/io/romio314/src/io_romio314_component.c +++ b/ompi/mca/io/romio314/src/io_romio314_component.c @@ -70,7 +70,7 @@ static int delete_priority_param = 20; /* * Global, component-wide ROMIO mutex because ROMIO is not thread safe */ -opal_mutex_t mca_io_romio314_mutex; +opal_mutex_t mca_io_romio314_mutex = {{0}}; /* diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c index 4c60fb8cf4..4c2d06d74f 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c @@ -14,6 +14,8 @@ * Copyright (c) 2006-2008 University of Houston. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012-2013 Sandia National Laboratories. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -121,7 +123,7 @@ ompi_osc_pt2pt_module_t ompi_osc_pt2pt_module_template = { } }; -bool ompi_osc_pt2pt_no_locks; +bool ompi_osc_pt2pt_no_locks = false; /* look up parameters for configuring this window. The code first looks in the info structure passed by the user, then through mca diff --git a/ompi/mca/pml/base/pml_base_frame.c b/ompi/mca/pml/base/pml_base_frame.c index ce3fb48e5a..84186f2434 100644 --- a/ompi/mca/pml/base/pml_base_frame.c +++ b/ompi/mca/pml/base/pml_base_frame.c @@ -13,6 +13,8 @@ * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -81,9 +83,9 @@ mca_pml_base_module_t mca_pml = { 0 /* pml_max_tag */ }; -mca_pml_base_component_t mca_pml_base_selected_component; -opal_pointer_array_t mca_pml_base_pml; -char *ompi_pml_base_bsend_allocator_name; +mca_pml_base_component_t mca_pml_base_selected_component = {{0}}; +opal_pointer_array_t mca_pml_base_pml = {{0}}; +char *ompi_pml_base_bsend_allocator_name = NULL; #if !MCA_ompi_pml_DIRECT_CALL && OPAL_ENABLE_FT_CR == 1 static char *ompi_pml_base_wrapper = NULL; diff --git a/ompi/mca/sbgp/base/sbgp_base_frame.c b/ompi/mca/sbgp/base/sbgp_base_frame.c index 0dec163eba..a0091e3532 100644 --- a/ompi/mca/sbgp/base/sbgp_base_frame.c +++ b/ompi/mca/sbgp/base/sbgp_base_frame.c @@ -3,6 +3,8 @@ * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. * Copyright (c) 2012-2014 Los Alamos National Security, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,9 +37,9 @@ /* ** * Global variables ** */ -opal_list_t mca_sbgp_base_components_in_use; +opal_list_t mca_sbgp_base_components_in_use = {{0}}; int mca_sbgp_base_components_in_use_inited=0; -OMPI_DECLSPEC char *ompi_sbgp_subgroups_string; +OMPI_DECLSPEC char *ompi_sbgp_subgroups_string = NULL; static void mca_sbgp_base_destruct (mca_sbgp_base_module_t *module) { diff --git a/ompi/mca/sharedfp/base/sharedfp_base_frame.c b/ompi/mca/sharedfp/base/sharedfp_base_frame.c index a1defae9ac..b3d73f3499 100644 --- a/ompi/mca/sharedfp/base/sharedfp_base_frame.c +++ b/ompi/mca/sharedfp/base/sharedfp_base_frame.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2008-2011 University of Houston. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -40,7 +42,7 @@ /* * Global variables */ -mca_sharedfp_base_module_t mca_sharedfp; +mca_sharedfp_base_module_t mca_sharedfp = {0}; static int mca_sharedfp_base_close(void) { diff --git a/ompi/mca/vprotocol/base/vprotocol_base.c b/ompi/mca/vprotocol/base/vprotocol_base.c index 2b6e71d13a..f8f8e77d21 100644 --- a/ompi/mca/vprotocol/base/vprotocol_base.c +++ b/ompi/mca/vprotocol/base/vprotocol_base.c @@ -3,6 +3,8 @@ * All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -16,7 +18,7 @@ #include "opal/mca/base/base.h" #include "ompi/mca/vprotocol/base/static-components.h" -char *mca_vprotocol_base_include_list; +char *mca_vprotocol_base_include_list = NULL; mca_pml_v_t mca_pml_v = {-1, 0, 0}; /* Load any vprotocol MCA component and call open function of all those diff --git a/ompi/mca/vprotocol/base/vprotocol_base_select.c b/ompi/mca/vprotocol/base/vprotocol_base_select.c index fe589d8c6c..99baa9606e 100644 --- a/ompi/mca/vprotocol/base/vprotocol_base_select.c +++ b/ompi/mca/vprotocol/base/vprotocol_base_select.c @@ -2,6 +2,8 @@ * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -20,7 +22,7 @@ #include "opal/mca/base/base.h" #include "ompi/mca/pml/v/pml_v_output.h" -mca_vprotocol_base_module_t mca_vprotocol; +mca_vprotocol_base_module_t mca_vprotocol = {0}; mca_vprotocol_base_component_t mca_vprotocol_component = { {MCA_VPROTOCOL_BASE_VERSION_0_0_0} /* Initialized with invalid version */ }; diff --git a/ompi/message/message.c b/ompi/message/message.c index 80a4f8179b..86b76a4688 100644 --- a/ompi/message/message.c +++ b/ompi/message/message.c @@ -1,9 +1,11 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. - * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -25,11 +27,11 @@ OBJ_CLASS_INSTANCE(ompi_message_t, opal_free_list_item_t, ompi_message_constructor, NULL); -opal_free_list_t ompi_message_free_list; -opal_pointer_array_t ompi_message_f_to_c_table; +opal_free_list_t ompi_message_free_list = {{{0}}}; +opal_pointer_array_t ompi_message_f_to_c_table = {{0}}; -ompi_predefined_message_t ompi_message_null; -ompi_predefined_message_t ompi_message_no_proc; +ompi_predefined_message_t ompi_message_null = {{{{{0}}}}}; +ompi_predefined_message_t ompi_message_no_proc = {{{{{0}}}}}; static void ompi_message_constructor(ompi_message_t *msg) { diff --git a/ompi/mpi/tool/mpit_common.c b/ompi/mpi/tool/mpit_common.c index 5dcb5c91e4..015a8faa5f 100644 --- a/ompi/mpi/tool/mpit_common.c +++ b/ompi/mpi/tool/mpit_common.c @@ -2,6 +2,8 @@ /* * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -11,7 +13,7 @@ #include "ompi/mpi/tool/mpit-internal.h" -opal_mutex_t mpit_big_lock; +opal_mutex_t mpit_big_lock = {{0}}; volatile uint32_t mpit_init_count = 0; volatile int32_t initted = 0; diff --git a/ompi/op/op.c b/ompi/op/op.c index 74bce2409a..d7a0427d25 100644 --- a/ompi/op/op.c +++ b/ompi/op/op.c @@ -14,6 +14,8 @@ * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -34,7 +36,7 @@ /* * Table for Fortran <-> C op handle conversion */ -opal_pointer_array_t *ompi_op_f_to_c_table; +opal_pointer_array_t *ompi_op_f_to_c_table = {0}; /* @@ -61,41 +63,41 @@ OBJ_CLASS_INSTANCE(ompi_op_t, opal_object_t, /* * Intrinsic MPI_Op objects (_addr flavors are for F03 bindings) */ -ompi_predefined_op_t ompi_mpi_op_null; +ompi_predefined_op_t ompi_mpi_op_null = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_null_addr = &ompi_mpi_op_null; -ompi_predefined_op_t ompi_mpi_op_max; +ompi_predefined_op_t ompi_mpi_op_max = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_max_addr = &ompi_mpi_op_max; -ompi_predefined_op_t ompi_mpi_op_min; +ompi_predefined_op_t ompi_mpi_op_min = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_min_addr = &ompi_mpi_op_min; -ompi_predefined_op_t ompi_mpi_op_sum; +ompi_predefined_op_t ompi_mpi_op_sum = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_sum_addr = &ompi_mpi_op_sum; -ompi_predefined_op_t ompi_mpi_op_prod; +ompi_predefined_op_t ompi_mpi_op_prod = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_prod_addr = &ompi_mpi_op_prod; -ompi_predefined_op_t ompi_mpi_op_land; +ompi_predefined_op_t ompi_mpi_op_land = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_land_addr = &ompi_mpi_op_land; -ompi_predefined_op_t ompi_mpi_op_band; +ompi_predefined_op_t ompi_mpi_op_band = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_band_addr = &ompi_mpi_op_band; -ompi_predefined_op_t ompi_mpi_op_lor; +ompi_predefined_op_t ompi_mpi_op_lor = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_lor_addr = &ompi_mpi_op_lor; -ompi_predefined_op_t ompi_mpi_op_bor; +ompi_predefined_op_t ompi_mpi_op_bor = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_bor_addr = &ompi_mpi_op_bor; -ompi_predefined_op_t ompi_mpi_op_lxor; +ompi_predefined_op_t ompi_mpi_op_lxor = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_lxor_addr = &ompi_mpi_op_lxor; -ompi_predefined_op_t ompi_mpi_op_bxor; +ompi_predefined_op_t ompi_mpi_op_bxor = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_bxor_addr = &ompi_mpi_op_bxor; -ompi_predefined_op_t ompi_mpi_op_maxloc; +ompi_predefined_op_t ompi_mpi_op_maxloc = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_maxloc_addr = &ompi_mpi_op_maxloc; -ompi_predefined_op_t ompi_mpi_op_minloc; +ompi_predefined_op_t ompi_mpi_op_minloc = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_minloc_addr = &ompi_mpi_op_minloc; -ompi_predefined_op_t ompi_mpi_op_replace; +ompi_predefined_op_t ompi_mpi_op_replace = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_replace_addr = &ompi_mpi_op_replace; -ompi_predefined_op_t ompi_mpi_op_no_op; +ompi_predefined_op_t ompi_mpi_op_no_op = {{{0}}}; ompi_predefined_op_t *ompi_mpi_op_no_op_addr = &ompi_mpi_op_no_op; /* * Map from ddt->id to position in op function pointer array */ -int ompi_op_ddt_map[OMPI_DATATYPE_MAX_PREDEFINED]; +int ompi_op_ddt_map[OMPI_DATATYPE_MAX_PREDEFINED] = {0}; /* Get the c complex operator associated with a fortran complex type */ #define FORTRAN_COMPLEX_OP_TYPE_X(type) OMPI_OP_BASE_TYPE_ ## type diff --git a/ompi/request/request.c b/ompi/request/request.c index aafd39ac0a..86155d7290 100644 --- a/ompi/request/request.c +++ b/ompi/request/request.c @@ -15,6 +15,8 @@ * Copyright (c) 2012 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,16 +32,16 @@ #include "ompi/request/request_default.h" #include "ompi/constants.h" -opal_pointer_array_t ompi_request_f_to_c_table; +opal_pointer_array_t ompi_request_f_to_c_table = {{0}}; size_t ompi_request_waiting = 0; size_t ompi_request_completed = 0; size_t ompi_request_failed = 0; -opal_mutex_t ompi_request_lock; -opal_condition_t ompi_request_cond; -ompi_predefined_request_t ompi_request_null; +opal_mutex_t ompi_request_lock = {{0}}; +opal_condition_t ompi_request_cond = {{0}}; +ompi_predefined_request_t ompi_request_null = {{{{{0}}}}}; ompi_predefined_request_t *ompi_request_null_addr = &ompi_request_null; -ompi_request_t ompi_request_empty; -ompi_status_public_t ompi_status_empty; +ompi_request_t ompi_request_empty = {{{{0}}}}; +ompi_status_public_t ompi_status_empty = {0}; ompi_request_fns_t ompi_request_functions = { ompi_request_default_test, ompi_request_default_test_any, diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c index 3258799964..596449ded3 100644 --- a/ompi/runtime/ompi_mpi_init.c +++ b/ompi/runtime/ompi_mpi_init.c @@ -18,7 +18,7 @@ * Copyright (c) 2011 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * * $COPYRIGHT$ @@ -257,37 +257,37 @@ MPI_Fint *MPI_F_STATUSES_IGNORE = NULL; ompi/include/mpif-common.h. */ -#define INST(type, upper_case, lower_case, single_u, double_u) \ -type lower_case; \ -type upper_case; \ -type single_u; \ -type double_u +#define INST(type, value, upper_case, lower_case, single_u, double_u) \ +type lower_case = value; \ +type upper_case = value; \ +type single_u = value; \ +type double_u = value -INST(int, MPI_FORTRAN_BOTTOM, mpi_fortran_bottom, +INST(int, -1, MPI_FORTRAN_BOTTOM, mpi_fortran_bottom, mpi_fortran_bottom_, mpi_fortran_bottom__); -INST(int, MPI_FORTRAN_IN_PLACE, mpi_fortran_in_place, +INST(int, -1, MPI_FORTRAN_IN_PLACE, mpi_fortran_in_place, mpi_fortran_in_place_, mpi_fortran_in_place__); -INST(int, MPI_FORTRAN_UNWEIGHTED, mpi_fortran_unweighted, +INST(int, -1, MPI_FORTRAN_UNWEIGHTED, mpi_fortran_unweighted, mpi_fortran_unweighted_, mpi_fortran_unweighted__); -INST(int, MPI_FORTRAN_WEIGHTS_EMPTY, mpi_fortran_weights_empty, +INST(int, -1, MPI_FORTRAN_WEIGHTS_EMPTY, mpi_fortran_weights_empty, mpi_fortran_weights_empty_, mpi_fortran_weights_empty__); -INST(char *, MPI_FORTRAN_ARGV_NULL, mpi_fortran_argv_null, +INST(char *, NULL, MPI_FORTRAN_ARGV_NULL, mpi_fortran_argv_null, mpi_fortran_argv_null_, mpi_fortran_argv_null__); -INST(char *, MPI_FORTRAN_ARGVS_NULL, mpi_fortran_argvs_null, +INST(char *, NULL, MPI_FORTRAN_ARGVS_NULL, mpi_fortran_argvs_null, mpi_fortran_argvs_null_, mpi_fortran_argvs_null__); -INST(int *, MPI_FORTRAN_ERRCODES_IGNORE, mpi_fortran_errcodes_ignore, +INST(int *, NULL, MPI_FORTRAN_ERRCODES_IGNORE, mpi_fortran_errcodes_ignore, mpi_fortran_errcodes_ignore_, mpi_fortran_errcodes_ignore__); -INST(int *, MPI_FORTRAN_STATUS_IGNORE, mpi_fortran_status_ignore, +INST(int *, NULL, MPI_FORTRAN_STATUS_IGNORE, mpi_fortran_status_ignore, mpi_fortran_status_ignore_, mpi_fortran_status_ignore__); -INST(int *, MPI_FORTRAN_STATUSES_IGNORE, mpi_fortran_statuses_ignore, +INST(int *, NULL, MPI_FORTRAN_STATUSES_IGNORE, mpi_fortran_statuses_ignore, mpi_fortran_statuses_ignore_, mpi_fortran_statuses_ignore__); /* * Hash tables for MPI_Type_create_f90* functions */ -opal_hash_table_t ompi_mpi_f90_integer_hashtable; -opal_hash_table_t ompi_mpi_f90_real_hashtable; -opal_hash_table_t ompi_mpi_f90_complex_hashtable; +opal_hash_table_t ompi_mpi_f90_integer_hashtable = {{0}}; +opal_hash_table_t ompi_mpi_f90_real_hashtable = {{0}}; +opal_hash_table_t ompi_mpi_f90_complex_hashtable = {{0}}; /* * Per MPI-2:9.5.3, MPI_REGISTER_DATAREP is a memory leak. There is @@ -296,9 +296,9 @@ opal_hash_table_t ompi_mpi_f90_complex_hashtable; * de-registered during MPI_FINALIZE so that memory-tracking debuggers * don't show Open MPI as leaking memory. */ -opal_list_t ompi_registered_datareps; +opal_list_t ompi_registered_datareps = {{0}}; -bool ompi_enable_timing, ompi_enable_timing_ext; +bool ompi_enable_timing = false, ompi_enable_timing_ext = false; extern bool ompi_mpi_yield_when_idle; extern int ompi_mpi_event_tick_rate; diff --git a/ompi/win/win.c b/ompi/win/win.c index 5fca9ed69f..066175afe2 100644 --- a/ompi/win/win.c +++ b/ompi/win/win.c @@ -14,6 +14,8 @@ * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,9 +40,9 @@ * Table for Fortran <-> C communicator handle conversion. Note that * these are not necessarily global. */ -opal_pointer_array_t ompi_mpi_windows; +opal_pointer_array_t ompi_mpi_windows = {{0}}; -ompi_predefined_win_t ompi_mpi_win_null; +ompi_predefined_win_t ompi_mpi_win_null = {{{0}}}; ompi_predefined_win_t *ompi_mpi_win_null_addr = &ompi_mpi_win_null; static void ompi_win_construct(ompi_win_t *win);