Skip to content

Commit 500cef6

Browse files
committed
OMPIO: Revert info precedence in File_set_view
User-provided info values should override existing info keys in the file. Signed-off-by: Joseph Schuchart <schuchart@icl.utk.edu> (cherry picked from commit 948511e)
1 parent 635d578 commit 500cef6

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ompi/mca/common/ompio/common_ompio_file_view.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,19 +222,19 @@ int mca_common_ompio_set_view (ompio_file_t *fh,
222222

223223
opal_cstring_t *stripe_str;
224224
/* Check the info object set during File_open */
225-
opal_info_get (fh->f_info, "cb_nodes", &stripe_str, &flag);
225+
opal_info_get (info, "cb_nodes", &stripe_str, &flag);
226226
if ( flag ) {
227227
sscanf ( stripe_str->string, "%d", &num_cb_nodes );
228228
OMPIO_MCA_PRINT_INFO(fh, "cb_nodes", stripe_str->string, "");
229+
/* add the key/value to the file's info object */
230+
opal_info_set_cstring(fh->f_info, "cb_nodes", stripe_str);
229231
OBJ_RELEASE(stripe_str);
230232
}
231233
else {
232234
/* Check the info object set during file_set_view */
233-
opal_info_get (info, "cb_nodes", &stripe_str, &flag);
235+
opal_info_get (fh->f_info, "cb_nodes", &stripe_str, &flag);
234236
if ( flag ) {
235237
sscanf ( stripe_str->string, "%d", &num_cb_nodes );
236-
/* add the key/value to the file's info object */
237-
opal_info_set_cstring(fh->f_info, "cb_nodes", stripe_str);
238238
OMPIO_MCA_PRINT_INFO(fh, "cb_nodes", stripe_str->string, "");
239239
OBJ_RELEASE(stripe_str);
240240
}
@@ -327,26 +327,26 @@ int mca_common_ompio_set_view (ompio_file_t *fh,
327327
}
328328

329329
bool info_is_set=false;
330-
opal_info_get (fh->f_info, "collective_buffering", &stripe_str, &flag);
330+
opal_info_get (info, "collective_buffering", &stripe_str, &flag);
331331
if ( flag ) {
332332
if ( strncmp ( stripe_str->string, "false", sizeof("true") )){
333333
info_is_set = true;
334334
OMPIO_MCA_PRINT_INFO(fh, "collective_buffering", stripe_str->string, "enforcing using individual fcoll component");
335335
} else {
336336
OMPIO_MCA_PRINT_INFO(fh, "collective_buffering", stripe_str->string, "");
337337
}
338+
/* add the key/value to the file's info object */
339+
opal_info_set_cstring(fh->f_info, "collective_buffering", stripe_str);
338340
OBJ_RELEASE(stripe_str);
339341
} else {
340-
opal_info_get (info, "collective_buffering", &stripe_str, &flag);
342+
opal_info_get (fh->f_info, "collective_buffering", &stripe_str, &flag);
341343
if ( flag ) {
342344
if ( strncmp ( stripe_str->string, "false", sizeof("true") )){
343345
info_is_set = true;
344346
OMPIO_MCA_PRINT_INFO(fh, "collective_buffering", stripe_str->string, "enforcing using individual fcoll component");
345347
} else {
346348
OMPIO_MCA_PRINT_INFO(fh, "collective_buffering", stripe_str->string, "");
347349
}
348-
/* add the key/value to the file's info object */
349-
opal_info_set_cstring(fh->f_info, "collective_buffering", stripe_str);
350350
OBJ_RELEASE(stripe_str);
351351
}
352352
}

0 commit comments

Comments
 (0)