Skip to content

Commit 14f27ff

Browse files
authored
Merge pull request #10976 from edgargabriel/topic/silence-sharedfp-sm
sharedfp/sm: convert output to use verbosity levels
2 parents 81b372f + a6d64a9 commit 14f27ff

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,30 +126,30 @@ struct mca_sharedfp_base_module_1_0_0_t * mca_sharedfp_lockedfile_component_file
126126
fd = open(filename, O_RDWR | O_CREAT, 0644);
127127

128128
if ( -1 == fd ){
129-
opal_output(ompi_sharedfp_base_framework.framework_output,
129+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
130130
"mca_sharedfp_lockedfile_component_file_query: error opening file %s %s", filename, strerror(errno));
131131
has_file_lock_support=false;
132132
}
133133
else{
134134
err = fcntl(fd, F_SETLKW, &lock);
135-
opal_output(ompi_sharedfp_base_framework.framework_output,
135+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
136136
"mca_sharedfp_lockedfile_component_file_query: returned err=%d, for fd=%d\n",err,fd);
137137

138138
if (err) {
139-
opal_output(ompi_sharedfp_base_framework.framework_output,
139+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
140140
"mca_sharedfp_lockedfile_component_file_query: Failed to set a file lock on %s %s\n", filename, strerror(errno) );
141-
opal_output(ompi_sharedfp_base_framework.framework_output,
141+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
142142
"err=%d, errno=%d, EOPNOTSUPP=%d, EINVAL=%d, ENOSYS=%d, EACCES=%d, EAGAIN=%d, EBADF=%d\n",
143143
err, errno, EOPNOTSUPP, EINVAL, ENOSYS, EACCES, EAGAIN, EBADF);
144144

145145
if (errno == EACCES || errno == EAGAIN) {
146-
opal_output(ompi_sharedfp_base_framework.framework_output,
146+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
147147
"errno=EACCES || EAGAIN, Already locked by another process\n");
148148
}
149149

150150
}
151151
else {
152-
opal_output(ompi_sharedfp_base_framework.framework_output,
152+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
153153
"mca_sharedfp_lockedfile_component_file_query: fcntl claims success in setting a file lock on %s\n", filename );
154154

155155
has_file_lock_support=true;
@@ -166,7 +166,7 @@ struct mca_sharedfp_base_module_1_0_0_t * mca_sharedfp_lockedfile_component_file
166166
*priority = 0;
167167
/*module can not run!, return NULL to indicate that we are unable to run*/
168168

169-
opal_output(ompi_sharedfp_base_framework.framework_output,
169+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
170170
"mca_sharedfp_lockedfile_component_file_query: Can not run!, file locking not supported\n");
171171
return NULL;
172172
}

ompi/mca/sharedfp/sm/sharedfp_sm.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ struct mca_sharedfp_base_module_1_0_0_t * mca_sharedfp_sm_component_file_query(o
9696
for (i = 0; i < size; ++i) {
9797
proc = ompi_group_peer_lookup(group,i);
9898
if (!OPAL_PROC_ON_LOCAL_NODE(proc->super.proc_flags)){
99-
opal_output(ompi_sharedfp_base_framework.framework_output,
99+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
100100
"mca_sharedfp_sm_component_file_query: Disqualifying myself: (%s/%s) "
101101
"not all processes are on the same node.",
102102
ompi_comm_print_cid (comm), comm->c_name);
@@ -119,7 +119,9 @@ struct mca_sharedfp_base_module_1_0_0_t * mca_sharedfp_sm_component_file_query(o
119119
S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
120120
if ( sm_fd == -1){
121121
/*error opening file*/
122-
opal_output(0,"mca_sharedfp_sm_component_file_query: Error, unable to open file for mmap: %s\n",sm_filename);
122+
opal_output_verbose(10, ompi_sharedfp_base_framework.framework_output,
123+
"mca_sharedfp_sm_component_file_query: Error, unable to open file "
124+
"for mmap: %s\n",sm_filename);
123125
free(sm_filename);
124126
return NULL;
125127
}

0 commit comments

Comments
 (0)