diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 03:51:41 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 03:51:41 (GMT) |
commit | 42efc1c2b591e4cd45ec6cb3bdf32044343118d2 (patch) | |
tree | 0ab542871c32246199479e8933ff26286aaf629a /testpar | |
parent | 3360c3af0c100ac4d3a2fe2865f34661da862ec5 (diff) | |
download | hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.zip hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.tar.gz hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.tar.bz2 |
[svn-r18451] Description:
Bring r18172:18446 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'testpar')
-rw-r--r-- | testpar/t_cache.c | 58 | ||||
-rw-r--r-- | testpar/t_chunk_alloc.c | 2 |
2 files changed, 30 insertions, 30 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 5b0e187..f9d43ef 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -129,10 +129,10 @@ long local_pins = 0; * processes, and thus cannot be marked as dirty unless they * happen to overlap some collective operation. * - * cleared: Boolean flag that is set to true whenever the entry is + * cleared: Boolean flag that is set to true whenever the entry is * dirty, and is cleared via a call to clear_datum(). * - * flushed: Boolean flag that is set to true whenever the entry is + * flushed: Boolean flag that is set to true whenever the entry is * dirty, and is flushed via a call to flush_datum(). * * index: Index of this instance of datum in the data_index[] array @@ -1435,7 +1435,7 @@ serve_read_request(struct mssg_t * mssg_ptr) HDfprintf(stdout, "%d:%s: proc %d read invalid entry. idx/base_addr = %d/%a.\n", world_mpi_rank, fcn_name, - mssg_ptr->src, + mssg_ptr->src, target_index, data[target_index].base_addr); } @@ -1817,7 +1817,7 @@ destroy_datum(H5F_t UNUSED * f, * value for communications with the server. * * JRM -- 2/4/09 - * Added code to set the flushed flag when a dirty entry + * Added code to set the flushed flag when a dirty entry * is flushed. * *------------------------------------------------------------------------- @@ -3674,11 +3674,11 @@ unlock_entry(H5C_t * cache_ptr, HDassert( ((entry_ptr->header).type)->id == DATUM_ENTRY_TYPE ); - if ( ( (flags & H5AC__DIRTIED_FLAG) != 0 ) && + if ( ( (flags & H5AC__DIRTIED_FLAG) != 0 ) && ( (flags & H5C__DELETED_FLAG) == 0 ) && - ( ! ( ( ( world_mpi_rank == 0 ) && ( entry_ptr->flushed ) ) + ( ! ( ( ( world_mpi_rank == 0 ) && ( entry_ptr->flushed ) ) || - ( ( world_mpi_rank != 0 ) && ( entry_ptr->cleared ) ) + ( ( world_mpi_rank != 0 ) && ( entry_ptr->cleared ) ) ) ) ) { @@ -5129,8 +5129,8 @@ smoke_check_5(void) if ( world_mpi_rank == world_server_mpi_rank ) { /* 1 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } if ( ! server_main() ) { @@ -5144,16 +5144,16 @@ smoke_check_5(void) } /* 2 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } } else /* run the clients */ { /* 1 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } if ( ! setup_cache_for_test(&fid, &file_ptr, &cache_ptr) ) { @@ -5168,8 +5168,8 @@ smoke_check_5(void) } /* 2 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } for ( i = 0; i < (virt_num_data_entries / 2); i++ ) @@ -5178,8 +5178,8 @@ smoke_check_5(void) } /* 3 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } /* flush the file so we can lock known clean entries. */ @@ -5192,8 +5192,8 @@ smoke_check_5(void) } /* 4 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } for ( i = 0; i < (virt_num_data_entries / 4); i++ ) @@ -5220,8 +5220,8 @@ smoke_check_5(void) } /* 5 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } for ( i = (virt_num_data_entries / 2) - 1; @@ -5256,8 +5256,8 @@ smoke_check_5(void) } /* 6 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } if ( fid >= 0 ) { @@ -5273,8 +5273,8 @@ smoke_check_5(void) } /* 7 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } /* verify that all instance of datum are back where the started @@ -5288,8 +5288,8 @@ smoke_check_5(void) } /* 8 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } /* compose the done message */ @@ -5317,8 +5317,8 @@ smoke_check_5(void) } /* 9 */ - if ( verbose ) { - HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); + if ( verbose ) { + HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); } } diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c index 4c581f6..bb13d4e 100644 --- a/testpar/t_chunk_alloc.c +++ b/testpar/t_chunk_alloc.c @@ -473,7 +473,7 @@ test_chunk_alloc(void) hid_t file_id, dataset; file_id = dataset = -1; - + /* Initialize MPI */ MPI_Comm_size(MPI_COMM_WORLD,&mpi_size); MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank); |