Commit 332a8a4c authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r7156] Delete unused code: ROMIO

Reviewed by robl.
parent a81d47d8
......@@ -340,84 +340,4 @@ void ADIOI_GRIDFTP_Open(ADIO_File fd, int *error_code)
}
}
num_gridftp_handles++;
#if 0
/* Debugging info for testing PASV mode behind firewalls */
if ( myrank==0 )
{
globus_bool_t striped;
globus_ftp_control_mode_t mode;
globus_ftp_control_type_t filetype;
globus_ftp_control_parallelism_t parallelism;
FPRINTF(stderr,"--gridftp details for %s--\n",
fd->filename);
/*
FPRINTF(stderr,"Connection caching: ");
globus_ftp_client_handleattr_get_cache_all(&hattr,&cached);
if ( cached==GLOBUS_TRUE )
FPRINTF(stderr,"Y\n");
else
FPRINTF(stderr,"N\n");
*/
FPRINTF(stderr,"Control mode: ");
globus_ftp_client_operationattr_get_mode(&(oattr[fd->fd_sys]),&mode);
if ( mode==GLOBUS_FTP_CONTROL_MODE_BLOCK )
FPRINTF(stderr,"block\n");
else if ( mode==GLOBUS_FTP_CONTROL_MODE_COMPRESSED )
FPRINTF(stderr,"compressed\n");
else if ( mode==GLOBUS_FTP_CONTROL_MODE_EXTENDED_BLOCK )
FPRINTF(stderr,"extended block\n");
else if ( mode==GLOBUS_FTP_CONTROL_MODE_STREAM )
FPRINTF(stderr,"stream\n");
else
FPRINTF(stderr,"unknown\n");
FPRINTF(stderr,"File type: ");
globus_ftp_client_operationattr_get_type(&(oattr[fd->fd_sys]),&filetype);
if ( filetype==GLOBUS_FTP_CONTROL_TYPE_ASCII )
FPRINTF(stderr,"ASCII\n");
else if ( filetype==GLOBUS_FTP_CONTROL_TYPE_IMAGE )
FPRINTF(stderr,"binary\n");
else if ( filetype==GLOBUS_FTP_CONTROL_TYPE_EBCDIC )
FPRINTF(stderr,"EBCDIC\n");
else
FPRINTF(stderr,"unknown\n");
FPRINTF(stderr,"Parallelism: ");
globus_ftp_client_operationattr_get_parallelism(&(oattr[fd->fd_sys]),&parallelism);
if ( parallelism.mode==GLOBUS_FTP_CONTROL_PARALLELISM_NONE )
FPRINTF(stderr,"none\n");
else if ( parallelism.mode==GLOBUS_FTP_CONTROL_PARALLELISM_FIXED )
FPRINTF(stderr,"fixed with %d streams\n",parallelism.fixed.size);
else
FPRINTF(stderr,"unknown\n");
FPRINTF(stderr,"Striping: ");
globus_ftp_client_operationattr_get_striped(&(oattr[fd->fd_sys]),&striped);
if ( striped==GLOBUS_TRUE )
{
globus_ftp_control_layout_t layout;
FPRINTF(stderr,"Y\nLayout: ");
globus_ftp_client_operationattr_get_layout(&(oattr[fd->fd_sys]),
&layout);
if ( layout.mode==GLOBUS_FTP_CONTROL_STRIPING_NONE )
FPRINTF(stderr,"none\n");
else if ( layout.mode==GLOBUS_FTP_CONTROL_STRIPING_PARTITIONED )
FPRINTF(stderr,"partitioned, size=%d\n",layout.partitioned.size);
else if ( layout.mode==GLOBUS_FTP_CONTROL_STRIPING_BLOCKED_ROUND_ROBIN )
FPRINTF(stderr,"round-robin, block size=%d\n",layout.round_robin.block_size);
else
FPRINTF(stderr,"unknown\n");
}
else
FPRINTF(stderr,"N\n");
fflush(stderr);
}
#endif
}
......@@ -50,10 +50,6 @@ static void readcontig_data_cb(void *myargs, globus_ftp_client_handle_t *handle,
readcontig_data_cb: buffer 0x404c0008 length 65536 offset 32112640 eof 0
readcontig_data_cb: buffer 0x404d0008 length 65536 offset 32178176 eof 0
*/
#if 0
FPRINTF(stderr, "%s: buffer %p length %d offset %Ld eof %d\n",
__func__, buffer, length, offset, eof);
#endif
if ( !eof )
globus_ftp_client_register_read(handle,
buffer+length,
......
......@@ -364,10 +364,6 @@ void ADIOI_GRIDFTP_WriteDiscontig(ADIO_File fd, void *buf, int count,
{
fd->fp_ind += extent;
fd->fp_sys_posn = fd->fp_ind;
#if 0
FPRINTF(stdout, "[%d/%d] new file position is %Ld\n", myrank,
nprocs, (long long) fd->fp_ind);
#endif
}
else {
fd->fp_sys_posn = offset + extent;
......
......@@ -284,11 +284,6 @@ void ADIOI_LUSTRE_Calc_my_req(ADIO_File fd, ADIO_Offset *offset_list,
}
}
}
#if 0
for (i = 0; i < nprocs; i++) {
FPRINTF(stdout, "buf_idx[%d] = 0x%x\n", i, buf_idx[i]);
}
#endif
#endif
*count_my_req_procs_ptr = count_my_req_procs;
......
......@@ -10,116 +10,6 @@ void ADIOI_NFS_ReadComplete(ADIO_Request *request, ADIO_Status *status,
int *error_code)
{
return;
#if 0
#ifdef ROMIO_HAVE_WORKING_AIO
int err;
static char myname[] = "ADIOI_NFS_READCOMPLETE";
#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_HANDLE
struct aiocb *tmp1;
#endif
#endif
if (*request == ADIO_REQUEST_NULL) {
*error_code = MPI_SUCCESS;
return;
}
#ifdef ROMIO_HAVE_AIO_SUSPEND_TWO_ARGS
/* old IBM */
if ((*request)->queued) {
do {
err = aio_suspend(1, (struct aiocb **) &((*request)->handle));
} while ((err == -1) && (errno == EINTR));
tmp1 = (struct aiocb *) (*request)->handle;
if (err != -1) {
err = aio_return(tmp1->aio_handle);
(*request)->nbytes = err;
errno = aio_error(tmp1->aio_handle);
}
else (*request)->nbytes = -1;
/* on DEC, it is required to call aio_return to dequeue the request.
IBM man pages don't indicate what function to use for dequeue.
I'm assuming it is aio_return! */
if (err == -1) {
*error_code = MPIO_Err_create_code(MPI_SUCCESS,
MPIR_ERR_RECOVERABLE, myname,
__LINE__, MPI_ERR_IO, "**io",
"**io %s", strerror(errno));
}
else *error_code = MPI_SUCCESS;
}
else *error_code = MPI_SUCCESS; /* if ( (*request)->queued ) */
#ifdef HAVE_STATUS_SET_BYTES
if ((*request)->nbytes != -1)
MPIR_Status_set_bytes(status, (*request)->datatype, (*request)->nbytes);
#endif
#elif defined(ROMIO_HAVE_WORKING_AIO)
/* all other aio types */
if ((*request)->queued) {
do {
err = aio_suspend((const struct aiocb **) &((*request)->handle), 1, 0);
} while ((err == -1) && (errno == EINTR));
if (err != -1) {
err = aio_return((struct aiocb *) (*request)->handle);
(*request)->nbytes = err;
errno = aio_error((struct aiocb *) (*request)->handle);
}
else (*request)->nbytes = -1;
if (err == -1) {
*error_code = MPIO_Err_create_code(MPI_SUCCESS,
MPIR_ERR_RECOVERABLE, myname,
__LINE__, MPI_ERR_IO, "**io",
"**io %s", strerror(errno));
}
else *error_code = MPI_SUCCESS;
}
else *error_code = MPI_SUCCESS; /* if ((*request)->queued) ... */
#ifdef HAVE_STATUS_SET_BYTES
if ((*request)->nbytes != -1)
MPIR_Status_set_bytes(status, (*request)->datatype, (*request)->nbytes);
#endif
#endif
#ifdef ROMIO_HAVE_WORKING_AIO
if ((*request)->queued != -1) {
/* queued = -1 is an internal hack used when the request must
be completed, but the request object should not be
freed. This is used in ADIOI_Complete_async, because the user
will call MPI_Wait later, which would require status to
be filled. Ugly but works. queued = -1 should be used only
in ADIOI_Complete_async.
This should not affect the user in any way. */
/* if request is still queued in the system, it is also there
on ADIOI_Async_list. Delete it from there. */
if ((*request)->queued) ADIOI_Del_req_from_list(request);
(*request)->fd->async_count--;
if ((*request)->handle) ADIOI_Free((*request)->handle);
ADIOI_Free_request((ADIOI_Req_node *) (*request));
*request = ADIO_REQUEST_NULL;
}
#else
/* no aio */
#ifdef HAVE_STATUS_SET_BYTES
MPIR_Status_set_bytes(status, (*request)->datatype, (*request)->nbytes);
#endif
(*request)->fd->async_count--;
ADIOI_Free_request((ADIOI_Req_node *) (*request));
*request = ADIO_REQUEST_NULL;
*error_code = MPI_SUCCESS;
#endif
#endif
}
......
......@@ -26,10 +26,6 @@ void ADIOI_TESTFS_ReadContig(ADIO_File fd, void *buf, int count,
offset = fd->fp_ind;
fd->fp_ind += datatype_size * count;
fd->fp_sys_posn = fd->fp_ind;
#if 0
FPRINTF(stdout, "[%d/%d] new file position is %lld\n", myrank,
nprocs, (long long) fd->fp_ind);
#endif
}
else {
fd->fp_sys_posn = offset + datatype_size * count;
......
......@@ -83,13 +83,6 @@ int ADIOI_Calc_aggregator(ADIO_File fd,
ADIOI_UNREFERENCED_ARG(fd_start);
#ifdef AGG_DEBUG
#if 0
FPRINTF(stdout, "off = %lld, min_off = %lld, len = %lld, fd_size = %lld\n",
off, min_off, *len, fd_size);
#endif
#endif
/* get an index into our array of aggregators */
rank_index = (int) ((off - min_off + fd_size)/ fd_size - 1);
......
......@@ -108,14 +108,6 @@ void ADIOI_IOStridedColl (ADIO_File fd, void *buf, int count, int rdwr,
likely to be common, let me do the simplest thing possible here:
Each process completes all pending nonblocking operations before
completing. */
#if 0
/* the "new generalized request" approach makes this impossible */
if (rdwr == ADIOI_WRITE) {
ADIOI_Complete_async(error_code);
if (*error_code != MPI_SUCCESS) return;
MPI_Barrier(fd->comm);
}
#endif
nprocs_for_coll = fd->hints->cb_nodes;
orig_fp = fd->fp_ind;
......
......@@ -18,13 +18,6 @@
#endif
void ADIOI_Optimize_flattened(ADIOI_Flatlist_node *flat_type);
#if 0 /* unused function ADIOI_Flatten_copy_type()*/
void ADIOI_Flatten_copy_type(ADIOI_Flatlist_node *flat,
int old_type_start,
int old_type_end,
int new_type_start,
ADIO_Offset offset_adjustment);
#endif /* unused function ADIOI_Flatten_copy_type()*/
/* flatten datatype and add it to Flatlist */
void ADIOI_Flatten_datatype(MPI_Datatype datatype)
{
......@@ -1135,26 +1128,3 @@ void ADIOI_Delete_flattened(MPI_Datatype datatype)
ADIOI_Free(flat);
}
}
#if 0 /* unused function ADIOI_Flatten_copy_type()*/
/* ADIOI_Flatten_copy_type()
* flat - pointer to flatlist node holding offset and lengths
* start - starting index of src type in arrays
* end - one larger than ending index of src type (makes loop clean)
* offset_adjustment - amount to add to "indices" (offset) component
* of each off/len pair copied
*/
void ADIOI_Flatten_copy_type(ADIOI_Flatlist_node *flat,
int old_type_start,
int old_type_end,
int new_type_start,
ADIO_Offset offset_adjustment)
{
int i, out_index = new_type_start;
for (i=old_type_start; i < old_type_end; i++) {
flat->indices[out_index] = flat->indices[i] + offset_adjustment;
flat->blocklens[out_index] = flat->blocklens[i];
out_index++;
}
}
#endif /* unused function ADIOI_Flatten_copy_type()*/
......@@ -78,15 +78,6 @@ struct ADIOI_Hints_struct {
};
#if 0
typedef int MPI_Datarep_conversion_function(void *userbuf,
MPI_Datatype datatype,
int count,
void *filebuf,
MPI_Offset position,
void *extra_state);
#endif
typedef struct ADIOI_Datarep {
char *name;
void *state;
......
......@@ -152,26 +152,6 @@
#define MPI_Group_union PMPI_Group_union
#undef MPI_Ibsend
#define MPI_Ibsend PMPI_Ibsend
#if 0
#undef MPI_Info_create
#define MPI_Info_create PMPI_Info_create
#undef MPI_Info_delete
#define MPI_Info_delete PMPI_Info_delete
#undef MPI_Info_dup
#define MPI_Info_dup PMPI_Info_dup
#undef MPI_Info_free
#define MPI_Info_free PMPI_Info_free
#undef MPI_Info_get
#define MPI_Info_get PMPI_Info_get
#undef MPI_Info_get_nkeys
#define MPI_Info_get_nkeys PMPI_Info_get_nkeys
#undef MPI_Info_get_nthkey
#define MPI_Info_get_nthkey PMPI_Info_get_nthkey
#undef MPI_Info_get_valuelen
#define MPI_Info_get_valuelen PMPI_Info_get_valuelen
#undef MPI_Info_set
#define MPI_Info_set PMPI_Info_set
#endif /* only conditionally set the info */
#undef MPI_Init
#define MPI_Init PMPI_Init
#undef MPI_Initialized
......
......@@ -80,16 +80,4 @@ int PREPEND_PREFIX(Type_convert_darray)(int size,
MPI_Datatype oldtype,
MPI_Datatype *newtype);
#if 0
/* Helper functions for accessing datatype contents */
void PREPEND_PREFIX(Type_access_contents)(MPI_Datatype type,
int **ints_p,
MPI_Aint **aints_p,
MPI_Datatype **types_p);
void PREPEND_PREFIX(Type_release_contents)(MPI_Datatype type,
int **ints_p,
MPI_Aint **aints_p,
MPI_Datatype **types_p);
#endif
#endif
......@@ -204,9 +204,6 @@ typedef struct DLOOP_Dataloop_common {
this union, 'count', allows quick access to the shared 'count' field in the
five dataloop structure.
. extent - The extent of the dataloop
#if 0
- handle - handle for the corresponding 'MPI_Datatype'.
#endif
Module:
Datatype
......
......@@ -548,16 +548,7 @@ static int DLOOP_Segment_index_count_block(DLOOP_Offset *blocks_p,
* DLOOP_Count i and DLOOP_Offset size would need to be
* declared above.
*/
#if 0
last_loc = rel_off * offsetarray[0] + blockarray[0] * el_size;
for (i=1; i < count; i++) {
if (last_loc == rel_off + offsetarray[i]) new_blk_count--;
last_loc = rel_off + offsetarray[i] + blockarray[i] * el_size;
}
#else
last_loc = rel_off + offsetarray[count-1] + blockarray[count-1] * el_size;
#endif
paramp->last_loc = last_loc;
paramp->count += new_blk_count;
......@@ -690,19 +681,6 @@ static int DLOOP_Segment_vector_mpi_flatten(DLOOP_Offset *blocks_p,
DLOOP_Handle_get_size_macro(el_type, el_size);
blocks_left = *blocks_p;
#if 0
MPIU_DBG_MSG_FMT(DATATYPE,VERBOSE,(MPIU_DBG_FDEST,
"\t[vector to vec: do=%d, dp=%x, len=%d, ind=%d, ct=%d, blksz=%d, str=%d, blks=%d]\n",
(unsigned) rel_off,
(unsigned) (MPI_Aint)bufp,
paramp->u.pack_vector.length,
paramp->u.pack_vector.index,
count,
blksz,
stride,
(int) *blocks_p));
#endif
for (i=0; i < count && blocks_left > 0; i++) {
int last_idx;
char *last_end = NULL;
......
......@@ -530,10 +530,6 @@ static void DLOOP_Type_calc_footprint_struct(MPI_Datatype type,
}
}
#if 0
printf("size = %d, extent = %d\n", (int) tmp_size, (int) tmp_extent);
#endif
tfp->size = tmp_size;
tfp->lb = min_lb;
tfp->ub = max_ub;
......@@ -882,46 +878,3 @@ static int DLOOP_Structalign_llint_position()
if (padding_varies_by_pos) return 1;
else return 0;
}
#if 0
/* from MPICH2 PAC_C_DOUBLE_ALIGNMENT_EXCEPTION test:
*
* Other tests assume that there is potentially a maximum alignment
* and that if there is no maximum alignment, or a type is smaller than
* that value, then we align on the size of the value, with the exception
* of the "position-based alignment" rules we test for separately.
*
* It turns out that these assumptions have fallen short in at least one
* case, on MacBook Pros, where doubles are aligned on 4-byte boundaries
* even when long doubles are aligned on 16-byte boundaries. So this test
* is here specifically to handle this case.
*
* Return value is 4 or 0.
*/
static int double_align_exception()
{
struct { char a; double b; } char_double;
struct { double b; char a; } double_char;
int extent1, extent2, align_4 = 0;
extent1 = sizeof(char_double);
extent2 = sizeof(double_char);
/* we're interested in the largest value, will let separate test
* deal with position-based issues.
*/
if (extent1 < extent2) extent1 = extent2;
if ((sizeof(double) == 8) && (extent1 % 8) != 0) {
if (extent1 % 4 == 0) {
#ifdef HAVE_MAX_FP_ALIGNMENT
if (HAVE_MAX_FP_ALIGNMENT >= 8) align_4 = 1;
#else
align_4 = 1;
#endif
}
}
if (align_4) return 4;
else return 0;
}
#endif
......@@ -125,20 +125,6 @@ int main(int argc, char **argv)
}
/* end of initialization */
#if 0
/* XXX: make the romio testcases handle more than one command line
* argument.. like --aggregation */
/* for deferred open: hint stuff */
MPI_Info_create(&info);
MPI_Info_set(info, "romio_no_indep_rw", "true");
MPI_Info_set(info, "romio_cb_read", "enable");
MPI_Info_set(info, "romio_cb_write", "enable");
MPI_Info_set(info, "cb_nodes", "1");
MPI_Info_set(info, "cb_config_list", "schwinn.mcs.anl.gov:1");
#endif
/* write the array to the file */
errcode = MPI_File_open(MPI_COMM_WORLD, filename,
MPI_MODE_CREATE | MPI_MODE_RDWR, info, &fh);
......
......@@ -16,21 +16,11 @@
* default hints. These hints are specific to the MPI-IO implementation, so
* pick one of the following profiles to use */
#if 0 /* hints are for BlueGene */
# define DFLT_CB_BUFFER_SIZE 16777216
# define DFLT_IND_RD_BUFFER_SIZE 4194304
# define DFLT_IND_WR_BUFFER_SIZE 4194304
# define DFLT_ROMIO_CB_READ "enable"
# define DFLT_ROMIO_CB_WRITE "enable"
# define SKIP_CB_CONFIG_LIST_TEST 1
#endif
#if 1 /* hints for MPICH2 */
# define DFLT_CB_BUFFER_SIZE 16777216
# define DFLT_IND_RD_BUFFER_SIZE 4194304
# define DFLT_IND_WR_BUFFER_SIZE 524288
# define DFLT_ROMIO_CB_READ "automatic"
# define DFLT_ROMIO_CB_WRITE "automatic"
#endif
/* #undef INFO_DEBUG */
/* Test will print out information about unexpected hint keys or values that
......@@ -123,13 +113,6 @@ int main(int argc, char **argv)
}
else if (!strcmp("cb_nodes", key)) {
/* unreliable test -- just ignore value */
#if 0
if (atoi(value) != 1) {
errs++;
if (verbose) fprintf(stderr, "cb_nodes is %d; should be %d\n", atoi(value),
1);
}
#endif
}
else if (!strcmp("romio_no_indep_rw", key)) {
if (strcmp("false", value)) {
......@@ -161,13 +144,6 @@ int main(int argc, char **argv)
}
else if (!strcmp("romio_ds_write", key)) {
/* Unreliable test -- value is file system dependent. Ignore. */
#if 0
if (strcmp("automatic", value)) {
errs++;
if (verbose) fprintf(stderr, "romio_ds_write is set to %s; should be %s\n",
value, "automatic");
}
#endif
}
else if (!strcmp("cb_config_list", key)) {
#ifndef SKIP_CB_CONFIG_LIST_TEST
......@@ -343,13 +319,6 @@ int main(int argc, char **argv)
}
else if (!strcmp("romio_ds_write", key)) {
/* Unreliable test -- value is file system dependent. Ignore. */
#if 0
if (strcmp("automatic", value)) {
errs++;
if (verbose) fprintf(stderr, "romio_ds_write is set to %s; should be %s\n",
value, "automatic");
}
#endif
}
else if (!strcmp("cb_config_list", key)) {
#ifndef SKIP_CB_CONFIG_LIST_TEST
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment