Merge pull request #3258 from markalle/pr/symbol_name_pollution

symbol name pollution

Author: jsquyres

configure.ac

@@ -22,7 +22,7 @@
 # Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
 # Copyright (c) 2014-2017 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
-# Copyright (c) 2016      IBM Corporation.  All rights reserved.
+# Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -1407,6 +1407,7 @@ AC_CONFIG_FILES([
     test/support/Makefile
     test/threads/Makefile
     test/util/Makefile
+    test/symbol_name/Makefile
 ])
 m4_ifdef([project_ompi], [AC_CONFIG_FILES([test/monitoring/Makefile])])
 m4_ifdef([project_ompi], [

contrib/update-my-copyright.pl

@@ -2,6 +2,7 @@
 #
 # Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2017      IBM Corporation. All rights reserved.
 # $COPYRIGHT$
 #
 
@@ -66,6 +67,7 @@
 # Defaults
 my $my_search_name = "Cisco";
 my $my_formal_name = "Cisco Systems, Inc.  All rights reserved.";
+my $my_manual_list = "";
 
 # Protected directories
 my @protected = qw(
@@ -80,13 +82,16 @@
     if (defined($ENV{OMPI_COPYRIGHT_SEARCH_NAME}));
 $my_formal_name = $ENV{OMPI_COPYRIGHT_FORMAL_NAME}
     if (defined($ENV{OMPI_COPYRIGHT_FORMAL_NAME}));
+$my_manual_list = $ENV{OMPI_COPYRIGHT_MANUAL_LIST}
+    if (defined($ENV{OMPI_COPYRIGHT_MANUAL_LIST}));
 
 GetOptions(
     "help" => \$HELP,
     "quiet" => \$QUIET,
     "check-only" => \$CHECK_ONLY,
     "search-name=s" => \$my_search_name,
     "formal-name=s" => \$my_formal_name,
+    "manual-list=s" => \$my_manual_list,
 ) or die "unable to parse options, stopped";
 
 if ($HELP) {
@@ -98,6 +103,7 @@
 --check-only         exit(111) if there are files with copyrights to edit
 --search-name=NAME   Set search name to NAME
 --formal-same=NAME   Set formal name to NAME
+--manual-list=FNAME  Use specified file as list of files to mod copyright
 EOT
     exit(0);
 }
@@ -143,6 +149,8 @@ sub quiet_print {
     if (-d "$top/.hg");
 $vcs = "svn"
     if (-d "$top/.svn");
+$vcs = "manual"
+    if ("$my_manual_list" ne "");
 
 my @files = find_modified_files($vcs);
 
@@ -363,6 +371,9 @@ sub find_modified_files {
         }
         close(CMD);
     }
+    elsif ($vcs eq "manual") {
+        @files = split(/\n/, `cat $my_manual_list`);
+    }
     else {
         die "unknown VCS '$vcs', stopped";
     }

ompi/mca/coll/base/coll_base_alltoall.c

@@ -14,6 +14,7 @@
  *                         reserved.
  * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -390,7 +391,7 @@ int ompi_coll_base_alltoall_intra_linear_sync(const void *sbuf, int scount,
                     (max_outstanding_reqs <= 0)) ?
                    (size - 1) : (max_outstanding_reqs));
     if (0 < total_reqs) {
-        reqs = coll_base_comm_get_reqs(module->base_data, 2 * total_reqs);
+        reqs = ompi_coll_base_comm_get_reqs(module->base_data, 2 * total_reqs);
         if (NULL == reqs) { error = -1; line = __LINE__; goto error_hndl; }
     }
 
@@ -613,7 +614,7 @@ int ompi_coll_base_alltoall_intra_basic_linear(const void *sbuf, int scount,
 
     /* Initiate all send/recv to/from others. */
 
-    req = rreq = coll_base_comm_get_reqs(data, (size - 1) * 2);
+    req = rreq = ompi_coll_base_comm_get_reqs(data, (size - 1) * 2);
     if (NULL == req) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto err_hndl; }
 
     prcv = (char *) rbuf;

ompi/mca/coll/base/coll_base_alltoallv.c

@@ -16,6 +16,7 @@
  * Copyright (c) 2013      FUJITSU LIMITED.  All rights reserved.
  * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -231,7 +232,7 @@ ompi_coll_base_alltoallv_intra_basic_linear(const void *sbuf, const int *scounts
 
     /* Now, initiate all send/recv to/from others. */
     nreqs = 0;
-    reqs = preq = coll_base_comm_get_reqs(data, 2 * size);
+    reqs = preq = ompi_coll_base_comm_get_reqs(data, 2 * size);
     if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; goto err_hndl; }
 
     /* Post all receives first */

ompi/mca/coll/base/coll_base_barrier.c

@@ -15,6 +15,7 @@
  *                         reserved.
  * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -342,7 +343,7 @@ int ompi_coll_base_barrier_intra_basic_linear(struct ompi_communicator_t *comm,
     /* The root collects and broadcasts the messages. */
 
     else {
-        requests = coll_base_comm_get_reqs(module->base_data, size);
+        requests = ompi_coll_base_comm_get_reqs(module->base_data, size);
         if( NULL == requests ) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto err_hndl; }
 
         for (i = 1; i < size; ++i) {

ompi/mca/coll/base/coll_base_bcast.c

@@ -13,6 +13,7 @@
  * Copyright (c) 2012      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2016      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -68,7 +69,7 @@ ompi_coll_base_bcast_intra_generic( void* buffer,
     tmpbuf = (char *) buffer;
 
     if( tree->tree_nextsize != 0 ) {
-        send_reqs = coll_base_comm_get_reqs(module->base_data, tree->tree_nextsize);
+        send_reqs = ompi_coll_base_comm_get_reqs(module->base_data, tree->tree_nextsize);
         if( NULL == send_reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto error_hndl; }
     }
 
@@ -628,7 +629,7 @@ ompi_coll_base_bcast_intra_basic_linear(void *buff, int count,
     }
 
     /* Root sends data to all others. */
-    preq = reqs = coll_base_comm_get_reqs(module->base_data, size-1);
+    preq = reqs = ompi_coll_base_comm_get_reqs(module->base_data, size-1);
     if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; goto err_hndl; }
 
     for (i = 0; i < size; ++i) {

ompi/mca/coll/base/coll_base_frame.c

@@ -14,6 +14,7 @@
  *                         reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -109,7 +110,7 @@ coll_base_comm_destruct(mca_coll_base_comm_t *data)
 OBJ_CLASS_INSTANCE(mca_coll_base_comm_t, opal_object_t,
                    coll_base_comm_construct, coll_base_comm_destruct);
 
-ompi_request_t** coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs)
+ompi_request_t** ompi_coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs)
 {
     if( 0 == nreqs ) return NULL;
 

ompi/mca/coll/base/coll_base_functions.h

@@ -455,6 +455,6 @@ static inline void ompi_coll_base_free_reqs(ompi_request_t **reqs, int count)
  * Return the array of requests on the data. If the array was not initialized
  * or if it's size was too small, allocate it to fit the requested size.
  */
-ompi_request_t** coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs);
+ompi_request_t** ompi_coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs);
 
 #endif /* MCA_COLL_BASE_EXPORT_H */

ompi/mca/coll/base/coll_base_gather.c

@@ -14,6 +14,7 @@
  *                         reserved.
  * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -267,7 +268,7 @@ ompi_coll_base_gather_intra_linear_sync(const void *sbuf, int scount,
         */
         char *ptmp;
         ompi_request_t *first_segment_req;
-        reqs = coll_base_comm_get_reqs(module->base_data, size);
+        reqs = ompi_coll_base_comm_get_reqs(module->base_data, size);
         if (NULL == reqs) { ret = -1; line = __LINE__; goto error_hndl; }
 
         ompi_datatype_type_size(rdtype, &typelng);

ompi/mca/coll/base/coll_base_reduce.c

@@ -287,7 +287,7 @@ int ompi_coll_base_reduce_generic( const void* sendbuf, void* recvbuf, int origi
 
             int creq = 0;
 
-            sreq = coll_base_comm_get_reqs(module->base_data, max_outstanding_reqs);
+            sreq = ompi_coll_base_comm_get_reqs(module->base_data, max_outstanding_reqs);
             if (NULL == sreq) { line = __LINE__; ret = -1; goto error_hndl; }
 
             /* post first group of requests */