Skip to content

Commit 23269cc

Browse files
awlauriaawlauria
authored
Merge pull request #8079 from markalle/exported_symbol_names
symbol pollution
2 parents 8cd7976 + 34b42b1 commit 23269cc

File tree

4 files changed

+30
-29
lines changed

4 files changed

+30
-29
lines changed

‎ompi/mca/hook/comm_method/hook_comm_method.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2018 IBM Corporation. All rights reserved.
2+
* Copyright (c) 2016-2020 IBM Corporation. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -22,11 +22,11 @@ OMPI_MODULE_DECLSPEC extern const ompi_hook_base_component_1_0_0_t mca_hook_comm
2222

2323
extern int mca_hook_comm_method_verbose;
2424
extern int mca_hook_comm_method_output;
25-
extern bool hook_comm_method_enable_mpi_init;
26-
extern bool hook_comm_method_enable_mpi_finalize;
27-
extern int hook_comm_method_max;
28-
extern int hook_comm_method_brief;
29-
extern char *hook_comm_method_fakefile;
25+
extern bool mca_hook_comm_method_enable_mpi_init;
26+
extern bool mca_hook_comm_method_enable_mpi_finalize;
27+
extern int mca_hook_comm_method_max;
28+
extern int mca_hook_comm_method_brief;
29+
extern char *mca_hook_comm_method_fakefile;
3030

3131
void ompi_hook_comm_method_mpi_init_bottom(int argc, char **argv, int requested, int *provided);
3232

‎ompi/mca/hook/comm_method/hook_comm_method_component.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2018 IBM Corporation. All rights reserved.
2+
* Copyright (c) 2016-2020 IBM Corporation. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -68,11 +68,11 @@ const ompi_hook_base_component_1_0_0_t mca_hook_comm_method_component = {
6868

6969
int mca_hook_comm_method_verbose = 0;
7070
int mca_hook_comm_method_output = -1;
71-
bool hook_comm_method_enable_mpi_init = false;
72-
bool hook_comm_method_enable_mpi_finalize = false;
73-
int hook_comm_method_max = 12;
74-
int hook_comm_method_brief = 0;
75-
char *hook_comm_method_fakefile = NULL;
71+
bool mca_hook_comm_method_enable_mpi_init = false;
72+
bool mca_hook_comm_method_enable_mpi_finalize = false;
73+
int mca_hook_comm_method_max = 12;
74+
int mca_hook_comm_method_brief = 0;
75+
char *mca_hook_comm_method_fakefile = NULL;
7676

7777
static int ompi_hook_comm_method_component_open(void)
7878
{
@@ -113,23 +113,23 @@ static int ompi_hook_comm_method_component_register(void)
113113
/*
114114
* If the component is active for mpi_init / mpi_finalize
115115
*/
116-
hook_comm_method_enable_mpi_init = false;
116+
mca_hook_comm_method_enable_mpi_init = false;
117117
(void) mca_base_component_var_register(&mca_hook_comm_method_component.hookm_version, "enable_mpi_init",
118118
"Enable comm_method behavior on mpi_init",
119119
MCA_BASE_VAR_TYPE_BOOL, NULL,
120120
0, 0,
121121
OPAL_INFO_LVL_3,
122122
MCA_BASE_VAR_SCOPE_READONLY,
123-
&hook_comm_method_enable_mpi_init);
123+
&mca_hook_comm_method_enable_mpi_init);
124124

125-
hook_comm_method_enable_mpi_finalize = false;
125+
mca_hook_comm_method_enable_mpi_finalize = false;
126126
(void) mca_base_component_var_register(&mca_hook_comm_method_component.hookm_version, "enable_mpi_finalize",
127127
"Enable comm_method behavior on mpi_finalize",
128128
MCA_BASE_VAR_TYPE_BOOL, NULL,
129129
0, 0,
130130
OPAL_INFO_LVL_3,
131131
MCA_BASE_VAR_SCOPE_READONLY,
132-
&hook_comm_method_enable_mpi_finalize);
132+
&mca_hook_comm_method_enable_mpi_finalize);
133133

134134
// User can set the comm_method mca variable too
135135
int hook_comm_method = -1;
@@ -142,10 +142,10 @@ static int ompi_hook_comm_method_component_register(void)
142142
&hook_comm_method);
143143

144144
if( 1 == hook_comm_method ) {
145-
hook_comm_method_enable_mpi_init = true;
145+
mca_hook_comm_method_enable_mpi_init = true;
146146
}
147147
else if( 2 == hook_comm_method ) {
148-
hook_comm_method_enable_mpi_finalize = true;
148+
mca_hook_comm_method_enable_mpi_finalize = true;
149149
}
150150

151151
// comm_method_max
@@ -155,15 +155,15 @@ static int ompi_hook_comm_method_component_register(void)
155155
0, 0,
156156
OPAL_INFO_LVL_3,
157157
MCA_BASE_VAR_SCOPE_READONLY,
158-
&hook_comm_method_max);
158+
&mca_hook_comm_method_max);
159159
// comm_method_brief
160160
(void) mca_base_var_register("ompi", NULL, NULL, "comm_method_brief",
161161
"Only print the comm method summary, skip the 2d table.",
162162
MCA_BASE_VAR_TYPE_INT, NULL,
163163
0, 0,
164164
OPAL_INFO_LVL_3,
165165
MCA_BASE_VAR_SCOPE_READONLY,
166-
&hook_comm_method_brief);
166+
&mca_hook_comm_method_brief);
167167

168168
// comm_method_fakefile is just for debugging, allows complete override of all the
169169
// comm method in the table
@@ -173,7 +173,7 @@ static int ompi_hook_comm_method_component_register(void)
173173
0, 0,
174174
OPAL_INFO_LVL_3,
175175
MCA_BASE_VAR_SCOPE_READONLY,
176-
&hook_comm_method_fakefile);
176+
&mca_hook_comm_method_fakefile);
177177

178178
return OMPI_SUCCESS;
179179
}

‎ompi/mca/hook/comm_method/hook_comm_method_fns.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2018 IBM Corporation. All rights reserved.
2+
* Copyright (c) 2016-2020 IBM Corporation. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -219,14 +219,14 @@ static void ompi_report_comm_methods(int called_from_location);
219219

220220
void ompi_hook_comm_method_mpi_init_bottom(int argc, char **argv, int requested, int *provided)
221221
{
222-
if( hook_comm_method_enable_mpi_init ) {
222+
if( mca_hook_comm_method_enable_mpi_init ) {
223223
ompi_report_comm_methods( 1 );
224224
}
225225
}
226226

227227
void ompi_hook_comm_method_mpi_finalize_top(void)
228228
{
229-
if( hook_comm_method_enable_mpi_finalize ) {
229+
if( mca_hook_comm_method_enable_mpi_finalize ) {
230230
ompi_report_comm_methods( 2 );
231231
}
232232
}
@@ -339,9 +339,9 @@ ompi_report_comm_methods(int called_from_location) // 1 = from init, 2 = from fi
339339
hpmp_myrank = ompi_comm_rank(MPI_COMM_WORLD);
340340
// hpmp_nprocs = ompi_comm_size(MPI_COMM_WORLD);
341341

342-
max2Dprottable = hook_comm_method_max;
342+
max2Dprottable = mca_hook_comm_method_max;
343343
max2D1Cprottable = 3 * max2Dprottable;
344-
if (hook_comm_method_brief) {
344+
if (mca_hook_comm_method_brief) {
345345
// force only the short summary output to be printed with no 2d table:
346346
max2Dprottable = 0;
347347
max2D1Cprottable = 0;
@@ -545,10 +545,10 @@ ompi_report_comm_methods(int called_from_location) // 1 = from init, 2 = from fi
545545
// settings, this is only for testing, eg to make sure the printing comes out
546546
// right.
547547
if (myleaderrank == 0) {
548-
if (hook_comm_method_fakefile) {
548+
if (mca_hook_comm_method_fakefile) {
549549
FILE *fp;
550550
int setting;
551-
fp = fopen(hook_comm_method_fakefile, "r");
551+
fp = fopen(mca_hook_comm_method_fakefile, "r");
552552
for (i=0; i<nleaderranks; ++i) {
553553
for (k=0; k<nleaderranks; ++k) {
554554
fscanf(fp, "%d", &setting);

‎ompi/runtime/ompi_spc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* and Technology (RIST). All rights reserved.
99
* Copyright (c) 2019 Mellanox Technologies, Inc.
1010
* All rights reserved.
11+
* Copyright (c) 2020 IBM Corporation. All rights reserved.
1112
* $COPYRIGHT$
1213
*
1314
* Additional copyrights may follow
@@ -17,7 +18,7 @@
1718

1819
#include "ompi_spc.h"
1920

20-
opal_timer_t sys_clock_freq_mhz = 0;
21+
static opal_timer_t sys_clock_freq_mhz = 0;
2122

2223
static void ompi_spc_dump(void);
2324

0 commit comments

Comments
 (0)