Skip to content

Commit ccf1780

Browse files
jsquyresjsquyres
authored
Merge pull request #3258 from markalle/pr/symbol_name_pollution
symbol name pollution
2 parents 3c0e94a + 552216f commit ccf1780

File tree

119 files changed

+794
-463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+794
-463
lines changed

‎configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
2323
# Copyright (c) 2014-2017 Research Organization for Information Science
2424
# and Technology (RIST). All rights reserved.
25-
# Copyright (c) 2016 IBM Corporation. All rights reserved.
25+
# Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
2626
# $COPYRIGHT$
2727
#
2828
# Additional copyrights may follow
@@ -1407,6 +1407,7 @@ AC_CONFIG_FILES([
14071407
test/support/Makefile
14081408
test/threads/Makefile
14091409
test/util/Makefile
1410+
test/symbol_name/Makefile
14101411
])
14111412
m4_ifdef([project_ompi], [AC_CONFIG_FILES([test/monitoring/Makefile])])
14121413
m4_ifdef([project_ompi], [

‎contrib/update-my-copyright.pl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
5+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
56
# $COPYRIGHT$
67
#
78

@@ -66,6 +67,7 @@
6667
# Defaults
6768
my $my_search_name = "Cisco";
6869
my $my_formal_name = "Cisco Systems, Inc. All rights reserved.";
70+
my $my_manual_list = "";
6971

7072
# Protected directories
7173
my @protected = qw(
@@ -80,13 +82,16 @@
8082
if (defined($ENV{OMPI_COPYRIGHT_SEARCH_NAME}));
8183
$my_formal_name = $ENV{OMPI_COPYRIGHT_FORMAL_NAME}
8284
if (defined($ENV{OMPI_COPYRIGHT_FORMAL_NAME}));
85+
$my_manual_list = $ENV{OMPI_COPYRIGHT_MANUAL_LIST}
86+
if (defined($ENV{OMPI_COPYRIGHT_MANUAL_LIST}));
8387

8488
GetOptions(
8589
"help" => \$HELP,
8690
"quiet" => \$QUIET,
8791
"check-only" => \$CHECK_ONLY,
8892
"search-name=s" => \$my_search_name,
8993
"formal-name=s" => \$my_formal_name,
94+
"manual-list=s" => \$my_manual_list,
9095
) or die "unable to parse options, stopped";
9196

9297
if ($HELP) {
@@ -98,6 +103,7 @@
98103
--check-only exit(111) if there are files with copyrights to edit
99104
--search-name=NAME Set search name to NAME
100105
--formal-same=NAME Set formal name to NAME
106+
--manual-list=FNAME Use specified file as list of files to mod copyright
101107
EOT
102108
exit(0);
103109
}
@@ -143,6 +149,8 @@ sub quiet_print {
143149
if (-d "$top/.hg");
144150
$vcs = "svn"
145151
if (-d "$top/.svn");
152+
$vcs = "manual"
153+
if ("$my_manual_list" ne "");
146154

147155
my @files = find_modified_files($vcs);
148156

@@ -363,6 +371,9 @@ sub find_modified_files {
363371
}
364372
close(CMD);
365373
}
374+
elsif ($vcs eq "manual") {
375+
@files = split(/\n/, `cat $my_manual_list`);
376+
}
366377
else {
367378
die "unknown VCS '$vcs', stopped";
368379
}

‎ompi/mca/coll/base/coll_base_alltoall.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2014-2017 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -390,7 +391,7 @@ int ompi_coll_base_alltoall_intra_linear_sync(const void *sbuf, int scount,
390391
(max_outstanding_reqs <= 0)) ?
391392
(size - 1) : (max_outstanding_reqs));
392393
if (0 < total_reqs) {
393-
reqs = coll_base_comm_get_reqs(module->base_data, 2 * total_reqs);
394+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, 2 * total_reqs);
394395
if (NULL == reqs) { error = -1; line = __LINE__; goto error_hndl; }
395396
}
396397

@@ -613,7 +614,7 @@ int ompi_coll_base_alltoall_intra_basic_linear(const void *sbuf, int scount,
613614

614615
/* Initiate all send/recv to/from others. */
615616

616-
req = rreq = coll_base_comm_get_reqs(data, (size - 1) * 2);
617+
req = rreq = ompi_coll_base_comm_get_reqs(data, (size - 1) * 2);
617618
if (NULL == req) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto err_hndl; }
618619

619620
prcv = (char *) rbuf;

‎ompi/mca/coll/base/coll_base_alltoallv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* Copyright (c) 2013 FUJITSU LIMITED. All rights reserved.
1717
* Copyright (c) 2014-2017 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
19+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1920
* $COPYRIGHT$
2021
*
2122
* Additional copyrights may follow
@@ -231,7 +232,7 @@ ompi_coll_base_alltoallv_intra_basic_linear(const void *sbuf, const int *scounts
231232

232233
/* Now, initiate all send/recv to/from others. */
233234
nreqs = 0;
234-
reqs = preq = coll_base_comm_get_reqs(data, 2 * size);
235+
reqs = preq = ompi_coll_base_comm_get_reqs(data, 2 * size);
235236
if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; goto err_hndl; }
236237

237238
/* Post all receives first */

‎ompi/mca/coll/base/coll_base_barrier.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* reserved.
1616
* Copyright (c) 2015-2016 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
18+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1819
* $COPYRIGHT$
1920
*
2021
* Additional copyrights may follow
@@ -342,7 +343,7 @@ int ompi_coll_base_barrier_intra_basic_linear(struct ompi_communicator_t *comm,
342343
/* The root collects and broadcasts the messages. */
343344

344345
else {
345-
requests = coll_base_comm_get_reqs(module->base_data, size);
346+
requests = ompi_coll_base_comm_get_reqs(module->base_data, size);
346347
if( NULL == requests ) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto err_hndl; }
347348

348349
for (i = 1; i < size; ++i) {

‎ompi/mca/coll/base/coll_base_bcast.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2016 Research Organization for Information Science
1515
* and Technology (RIST). All rights reserved.
16+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1617
* $COPYRIGHT$
1718
*
1819
* Additional copyrights may follow
@@ -68,7 +69,7 @@ ompi_coll_base_bcast_intra_generic( void* buffer,
6869
tmpbuf = (char *) buffer;
6970

7071
if( tree->tree_nextsize != 0 ) {
71-
send_reqs = coll_base_comm_get_reqs(module->base_data, tree->tree_nextsize);
72+
send_reqs = ompi_coll_base_comm_get_reqs(module->base_data, tree->tree_nextsize);
7273
if( NULL == send_reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto error_hndl; }
7374
}
7475

@@ -628,7 +629,7 @@ ompi_coll_base_bcast_intra_basic_linear(void *buff, int count,
628629
}
629630

630631
/* Root sends data to all others. */
631-
preq = reqs = coll_base_comm_get_reqs(module->base_data, size-1);
632+
preq = reqs = ompi_coll_base_comm_get_reqs(module->base_data, size-1);
632633
if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; goto err_hndl; }
633634

634635
for (i = 0; i < size; ++i) {

‎ompi/mca/coll/base/coll_base_frame.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2014 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -109,7 +110,7 @@ coll_base_comm_destruct(mca_coll_base_comm_t *data)
109110
OBJ_CLASS_INSTANCE(mca_coll_base_comm_t, opal_object_t,
110111
coll_base_comm_construct, coll_base_comm_destruct);
111112

112-
ompi_request_t** coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs)
113+
ompi_request_t** ompi_coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs)
113114
{
114115
if( 0 == nreqs ) return NULL;
115116

‎ompi/mca/coll/base/coll_base_functions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,6 @@ static inline void ompi_coll_base_free_reqs(ompi_request_t **reqs, int count)
455455
* Return the array of requests on the data. If the array was not initialized
456456
* or if it's size was too small, allocate it to fit the requested size.
457457
*/
458-
ompi_request_t** coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs);
458+
ompi_request_t** ompi_coll_base_comm_get_reqs(mca_coll_base_comm_t* data, int nreqs);
459459

460460
#endif /* MCA_COLL_BASE_EXPORT_H */

‎ompi/mca/coll/base/coll_base_gather.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2015-2016 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -267,7 +268,7 @@ ompi_coll_base_gather_intra_linear_sync(const void *sbuf, int scount,
267268
*/
268269
char *ptmp;
269270
ompi_request_t *first_segment_req;
270-
reqs = coll_base_comm_get_reqs(module->base_data, size);
271+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, size);
271272
if (NULL == reqs) { ret = -1; line = __LINE__; goto error_hndl; }
272273

273274
ompi_datatype_type_size(rdtype, &typelng);

‎ompi/mca/coll/base/coll_base_reduce.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ int ompi_coll_base_reduce_generic( const void* sendbuf, void* recvbuf, int origi
287287

288288
int creq = 0;
289289

290-
sreq = coll_base_comm_get_reqs(module->base_data, max_outstanding_reqs);
290+
sreq = ompi_coll_base_comm_get_reqs(module->base_data, max_outstanding_reqs);
291291
if (NULL == sreq) { line = __LINE__; ret = -1; goto error_hndl; }
292292

293293
/* post first group of requests */

‎ompi/mca/coll/basic/coll_basic_allgather.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2014-2016 Research Organization for Information Science
1313
* and Technology (RIST). All rights reserved.
14+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1415
* $COPYRIGHT$
1516
*
1617
* Additional copyrights may follow
@@ -78,7 +79,7 @@ mca_coll_basic_allgather_inter(const void *sbuf, int scount,
7879
if (OMPI_SUCCESS != err) { line = __LINE__; goto exit; }
7980

8081
/* Get a requests arrays of the right size */
81-
reqs = coll_base_comm_get_reqs(module->base_data, rsize + 1);
82+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, rsize + 1);
8283
if( NULL == reqs ) { line = __LINE__; err = OMPI_ERR_OUT_OF_RESOURCE; goto exit; }
8384

8485
/* Do a send-recv between the two root procs. to avoid deadlock */

‎ompi/mca/coll/basic/coll_basic_allreduce.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2015-2017 Research Organization for Information Science
1313
* and Technology (RIST). All rights reserved.
14+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1415
* $COPYRIGHT$
1516
*
1617
* Additional copyrights may follow
@@ -109,7 +110,7 @@ mca_coll_basic_allreduce_inter(const void *sbuf, void *rbuf, int count,
109110
pml_buffer = tmpbuf - gap;
110111

111112
if (rsize > 1) {
112-
reqs = coll_base_comm_get_reqs(module->base_data, rsize - 1);
113+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, rsize - 1);
113114
if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; line = __LINE__; goto exit; }
114115
}
115116

‎ompi/mca/coll/basic/coll_basic_alltoall.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2014-2015 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -77,7 +78,7 @@ mca_coll_basic_alltoall_inter(const void *sbuf, int scount,
7778

7879
/* Initiate all send/recv to/from others. */
7980
nreqs = size * 2;
80-
req = rreq = coll_base_comm_get_reqs( module->base_data, nreqs);
81+
req = rreq = ompi_coll_base_comm_get_reqs( module->base_data, nreqs);
8182
if( NULL == req ) { return OMPI_ERR_OUT_OF_RESOURCE; }
8283
sreq = rreq + size;
8384

‎ompi/mca/coll/basic/coll_basic_alltoallv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* Copyright (c) 2013 FUJITSU LIMITED. All rights reserved.
1616
* Copyright (c) 2014-2015 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
18+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1819
* $COPYRIGHT$
1920
*
2021
* Additional copyrights may follow
@@ -68,7 +69,7 @@ mca_coll_basic_alltoallv_inter(const void *sbuf, const int *scounts, const int *
6869

6970
/* Initiate all send/recv to/from others. */
7071
nreqs = rsize * 2;
71-
preq = coll_base_comm_get_reqs(module->base_data, nreqs);
72+
preq = ompi_coll_base_comm_get_reqs(module->base_data, nreqs);
7273
if( NULL == preq ) { return OMPI_ERR_OUT_OF_RESOURCE; }
7374

7475
/* Post all receives first */

‎ompi/mca/coll/basic/coll_basic_alltoallw.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* Copyright (c) 2014-2016 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
1919
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
20+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
2021
* $COPYRIGHT$
2122
*
2223
* Additional copyrights may follow
@@ -179,7 +180,7 @@ mca_coll_basic_alltoallw_intra(const void *sbuf, const int *scounts, const int *
179180
/* Initiate all send/recv to/from others. */
180181

181182
nreqs = 0;
182-
reqs = preq = coll_base_comm_get_reqs(module->base_data, 2 * size);
183+
reqs = preq = ompi_coll_base_comm_get_reqs(module->base_data, 2 * size);
183184
if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
184185

185186
/* Post all receives first -- a simple optimization */
@@ -269,7 +270,7 @@ mca_coll_basic_alltoallw_inter(const void *sbuf, const int *scounts, const int *
269270

270271
/* Initiate all send/recv to/from others. */
271272
nreqs = 0;
272-
reqs = preq = coll_base_comm_get_reqs(module->base_data, 2 * size);
273+
reqs = preq = ompi_coll_base_comm_get_reqs(module->base_data, 2 * size);
273274
if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
274275

275276
/* Post all receives first -- a simple optimization */

‎ompi/mca/coll/basic/coll_basic_bcast.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2016 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
15+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -81,7 +82,7 @@ mca_coll_basic_bcast_log_intra(void *buff, int count,
8182

8283
/* Send data to the children. */
8384

84-
reqs = coll_base_comm_get_reqs(module->base_data, size);
85+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, size);
8586
if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
8687

8788
err = MPI_SUCCESS;
@@ -156,7 +157,7 @@ mca_coll_basic_bcast_lin_inter(void *buff, int count,
156157
MCA_COLL_BASE_TAG_BCAST, comm,
157158
MPI_STATUS_IGNORE));
158159
} else {
159-
reqs = coll_base_comm_get_reqs(module->base_data, rsize);
160+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, rsize);
160161
if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
161162

162163
/* root section */

‎ompi/mca/coll/basic/coll_basic_gatherv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2015 Research Organization for Information Science
1313
* and Technology (RIST). All rights reserved.
14+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1415
* $COPYRIGHT$
1516
*
1617
* Additional copyrights may follow
@@ -142,7 +143,7 @@ mca_coll_basic_gatherv_inter(const void *sbuf, int scount,
142143
return OMPI_ERROR;
143144
}
144145

145-
reqs = coll_base_comm_get_reqs(module->base_data, size);
146+
reqs = ompi_coll_base_comm_get_reqs(module->base_data, size);
146147
if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
147148

148149
for (i = 0; i < size; ++i) {

‎ompi/mca/coll/basic/coll_basic_neighbor_allgather.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2014-2015 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -52,7 +53,7 @@ mca_coll_basic_neighbor_allgather_cart(const void *sbuf, int scount,
5253

5354
ompi_datatype_get_extent(rdtype, &lb, &extent);
5455

55-
reqs = preqs = coll_base_comm_get_reqs( module->base_data, 4 * cart->ndims );
56+
reqs = preqs = ompi_coll_base_comm_get_reqs( module->base_data, 4 * cart->ndims );
5657
if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
5758

5859
/* The ordering is defined as -1 then +1 in each dimension in
@@ -139,7 +140,7 @@ mca_coll_basic_neighbor_allgather_graph(const void *sbuf, int scount,
139140
}
140141

141142
ompi_datatype_get_extent(rdtype, &lb, &extent);
142-
reqs = preqs = coll_base_comm_get_reqs( module->base_data, 2 * degree);
143+
reqs = preqs = ompi_coll_base_comm_get_reqs( module->base_data, 2 * degree);
143144
if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
144145

145146
for (neighbor = 0; neighbor < degree ; ++neighbor) {
@@ -190,7 +191,7 @@ mca_coll_basic_neighbor_allgather_dist_graph(const void *sbuf, int scount,
190191
outedges = dist_graph->out;
191192

192193
ompi_datatype_get_extent(rdtype, &lb, &extent);
193-
reqs = preqs = coll_base_comm_get_reqs( module->base_data, indegree + outdegree);
194+
reqs = preqs = ompi_coll_base_comm_get_reqs( module->base_data, indegree + outdegree);
194195
if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
195196

196197
for (neighbor = 0; neighbor < indegree ; ++neighbor) {

0 commit comments

Comments
 (0)