ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Next step: Back out r17543 (ficxing a bunch of ROMIO warnings). Let's

Просмотр исходного кода 
see how the next gen panasas stuff does in terms of warnings; we can
always re-merge this later if we want to.  It's just easier if we have
as little OMPI-specific code as possible (particularly when we know
that the panasas code has some big changes coming).

This commit was SVN r18823.

The following SVN revision numbers were found above:
  r17543 --> open-mpi/ompi@b4ec81a9fd
Этот коммит содержится в:
Jeff Squyres 2008-07-07 23:22:26 +00:00
родитель 09ff80ff06
Коммит 83987fea75
2 изменённых файлов: 10 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
ompi/mca/io/romio/romio/adio/ad_panfs/ad_panfs_hints.c
Просмотреть файл

@ -6,13 +6,13 @@
* See COPYRIGHT notice in top-level directory. * See COPYRIGHT notice in top-level directory.
*/ */
#include "opal/mca/base/mca_base_param.h"
#include "ad_panfs.h" #include "ad_panfs.h"
#include <pan_fs_client_cw_mode.h> #include <pan_fs_client_cw_mode.h>
#include "opal/mca/base/mca_base_param.h"
void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code) void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
{ {
/* static char myname[] = "ADIOI_PANFS_SETINFO"; */ static char myname[] = "ADIOI_PANFS_SETINFO";
char* value; char* value;
int flag, tmp_val = -1; int flag, tmp_val = -1;
unsigned long int concurrent_write = 0; unsigned long int concurrent_write = 0;
@ -43,7 +43,7 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
concurrent_write = strtoul(value,NULL,10); concurrent_write = strtoul(value,NULL,10);
tmp_val = concurrent_write; tmp_val = concurrent_write;
MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm); MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm);
if (tmp_val != (int)concurrent_write) { if (tmp_val != concurrent_write) {
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_concurrent_write\" must be the same on all processes\n"); FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_concurrent_write\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1); MPI_Abort(MPI_COMM_WORLD, 1);
} }
@ -56,7 +56,7 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
layout_type = strtoul(value,NULL,10); layout_type = strtoul(value,NULL,10);
tmp_val = layout_type; tmp_val = layout_type;
MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm); MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm);
if (tmp_val != (int)layout_type) { if (tmp_val != layout_type) {
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_type\" must be the same on all processes\n"); FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_type\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1); MPI_Abort(MPI_COMM_WORLD, 1);
} }
@ -69,7 +69,7 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
layout_stripe_unit = strtoul(value,NULL,10); layout_stripe_unit = strtoul(value,NULL,10);
tmp_val = layout_stripe_unit; tmp_val = layout_stripe_unit;
MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm); MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm);
if (tmp_val != (int)layout_stripe_unit) { if (tmp_val != layout_stripe_unit) {
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_stripe_unit\" must be the same on all processes\n"); FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_stripe_unit\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1); MPI_Abort(MPI_COMM_WORLD, 1);
} }
@ -82,7 +82,7 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
layout_parity_stripe_width = strtoul(value,NULL,10); layout_parity_stripe_width = strtoul(value,NULL,10);
tmp_val = layout_parity_stripe_width; tmp_val = layout_parity_stripe_width;
MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm); MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm);
if (tmp_val != (int)layout_parity_stripe_width) { if (tmp_val != layout_parity_stripe_width) {
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_parity_stripe_width\" must be the same on all processes\n"); FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_parity_stripe_width\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1); MPI_Abort(MPI_COMM_WORLD, 1);
} }
@ -95,7 +95,7 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
layout_parity_stripe_depth = strtoul(value,NULL,10); layout_parity_stripe_depth = strtoul(value,NULL,10);
tmp_val = layout_parity_stripe_depth; tmp_val = layout_parity_stripe_depth;
MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm); MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm);
if (tmp_val != (int)layout_parity_stripe_depth) { if (tmp_val != layout_parity_stripe_depth) {
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_parity_stripe_depth\" must be the same on all processes\n"); FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_parity_stripe_depth\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1); MPI_Abort(MPI_COMM_WORLD, 1);
} }
@ -108,7 +108,7 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
layout_total_num_comps = strtoul(value,NULL,10); layout_total_num_comps = strtoul(value,NULL,10);
tmp_val = layout_total_num_comps; tmp_val = layout_total_num_comps;
MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm); MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm);
if (tmp_val != (int)layout_total_num_comps) { if (tmp_val != layout_total_num_comps) {
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_total_num_comps\" must be the same on all processes\n"); FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_total_num_comps\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1); MPI_Abort(MPI_COMM_WORLD, 1);
} }
@ -121,7 +121,7 @@ void ADIOI_PANFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
layout_visit_policy = strtoul(value,NULL,10); layout_visit_policy = strtoul(value,NULL,10);
tmp_val = layout_visit_policy; tmp_val = layout_visit_policy;
MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm); MPI_Bcast(&tmp_val, 1, MPI_INT, 0, fd->comm);
if (tmp_val != (int)layout_visit_policy) { if (tmp_val != layout_visit_policy) {
FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_visit_policy\" must be the same on all processes\n"); FPRINTF(stderr, "ADIOI_PANFS_SetInfo: the value for key \"panfs_layout_visit_policy\" must be the same on all processes\n");
MPI_Abort(MPI_COMM_WORLD, 1); MPI_Abort(MPI_COMM_WORLD, 1);
} }

8
ompi/mca/io/romio/romio/adio/ad_panfs/ad_panfs_open.c
Просмотреть файл

@ -133,8 +133,7 @@ void ADIOI_PANFS_Open(ADIO_File fd, int *error_code)
char* slash; char* slash;
struct stat stat_buf; struct stat stat_buf;
int err; int err;
/* char *value, *path, *file_name_ptr; */ char *value, *path, *file_name_ptr;
char *path;
/* Check that the file does not exist before /* Check that the file does not exist before
* trying to create it. The ioctl itself should * trying to create it. The ioctl itself should
@ -280,11 +279,6 @@ void ADIOI_PANFS_Open(ADIO_File fd, int *error_code)
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid1_5_parity_stripe.layout_visit_policy); ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid1_5_parity_stripe.layout_visit_policy);
MPI_Info_set(fd->info, "panfs_layout_visit_policy", temp_buffer); MPI_Info_set(fd->info, "panfs_layout_visit_policy", temp_buffer);
break; break;
case PAN_FS_CLIENT_LAYOUT_TYPE__INVALID:
case PAN_FS_CLIENT_LAYOUT_TYPE__DEFAULT:
case PAN_FS_CLIENT_LAYOUT_TYPE__RAID10:
MPI_Info_set(fd->info, "panfs_layout_type", "PAN_FS_CLIENT_LAYOUT_TYPE__INVALID");
break;
} }
} }
} }