From 39cee80bc7f9e8e9d4074986a43a709737519d7e Mon Sep 17 00:00:00 2001 From: Marc Howison Date: Fri, 23 Sep 2011 14:47:11 +0000 Subject: [PATCH] 1.6.5 release: Fixed several build errors reported by Iuri Prilepov on Ubuntu 11.04. --- NEWS | 12 ++++++++++++ configure.ac | 2 +- src/H5MultiBlock.c | 4 ++-- src/H5Part.c | 8 ++++---- src/H5Part.h | 4 ++-- src/H5PartPrivate.h | 18 ++++++++++++++++++ test/read.c | 1 + test/testframe.c | 4 ++-- test/testframe.h | 2 ++ 9 files changed, 44 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index 51aedf3..afa6c8b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +#### H5PART 1.6.5 ############################################################ + +Fixed several build errors reported by Iuri Prilepov on Ubuntu 11.04. + +#### H5PART 1.6.4 ############################################################ + +Fixed bug where H5PartSetViewIndices was not setting an empty view when the +number of elements is 0. + +Set a threshold on the HDF5 alignment parameter so that small metadata writes +are not aligned, which causes large gaps in the file. + #### H5PART 1.6.3 ############################################################ New build system uses libtool and can build shared libraries. diff --git a/configure.ac b/configure.ac index 5cb1700..c2b38d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Every configure script must call AC_INIT before doing anything else. # AC_INIT (package, version, [bug-report], [tarname]) -AC_INIT([H5Part], [1.6.3], [h5part@lists.psi.ch], H5Part) +AC_INIT([H5Part], [1.6.5], [h5part@lists.psi.ch], H5Part) # Ensure that a recent enough version of Autoconf is being used. # If the version of Autoconf being used to create configure is earlier than version, diff --git a/src/H5MultiBlock.c b/src/H5MultiBlock.c index 938fe13..baceff2 100644 --- a/src/H5MultiBlock.c +++ b/src/H5MultiBlock.c @@ -567,10 +567,10 @@ _halo_exchange_buffers ( ibufsize = (int)bufsize; if ( (h5part_int64_t)ibufsize != bufsize ) return HANDLE_MPI_INT64_ERR; - send_buffer = malloc ( bufsize ); + send_buffer = (char*) malloc ( bufsize ); if ( send_buffer == NULL ) return HANDLE_H5PART_NOMEM_ERR; - recv_buffer = malloc ( bufsize ); + recv_buffer = (char*) malloc ( bufsize ); if ( recv_buffer == NULL ) return HANDLE_H5PART_NOMEM_ERR; /* forward */ diff --git a/src/H5Part.c b/src/H5Part.c index e6885c2..a50ea4d 100644 --- a/src/H5Part.c +++ b/src/H5Part.c @@ -291,9 +291,9 @@ _H5Part_open_file ( if ( align != 0 ) { _H5Part_print_info ( - "Setting HDF5 alignment to %ld bytes", + "Setting HDF5 alignment to %ld bytes with threshold at half that many bytes", align ); - if (H5Pset_alignment ( f->access_prop, 0, align ) < 0) { + if (H5Pset_alignment ( f->access_prop, align/2, align ) < 0) { HANDLE_H5P_SET_FAPL_ERR; goto error_cleanup; } @@ -2859,9 +2859,9 @@ _set_view_indices ( herr = _reset_view ( f ); if ( herr < 0 ) return herr; - if ( indices == NULL || nelems <= 0 ) { + if ( indices == NULL || nelems < 0 ) { _H5Part_print_warn ( - "View indices array is null or size is <= 0: reseting view." ); + "View indices array is null or size is < 0: reseting view." ); return H5PART_SUCCESS; } diff --git a/src/H5Part.h b/src/H5Part.h index 724be55..e55c3d3 100644 --- a/src/H5Part.h +++ b/src/H5Part.h @@ -16,10 +16,10 @@ extern "C" { #include "H5MultiBlock.h" #endif -#define H5PART_VER_STRING "1.6.3" +#define H5PART_VER_STRING "1.6.5" #define H5PART_VER_MAJOR 1 #define H5PART_VER_MINOR 6 -#define H5PART_VER_RELEASE 3 +#define H5PART_VER_RELEASE 5 /* error values */ #define H5PART_SUCCESS 0 diff --git a/src/H5PartPrivate.h b/src/H5PartPrivate.h index a5f3bfc..4f28bfb 100644 --- a/src/H5PartPrivate.h +++ b/src/H5PartPrivate.h @@ -116,6 +116,24 @@ _H5Part_write_attrib ( const hsize_t attrib_nelem ); +h5part_int64_t +_H5Part_write_file_attrib ( + H5PartFile *f, + const char *name, + const hid_t type, + const void *value, + const hsize_t nelem + ); + +h5part_int64_t +_H5Part_write_step_attrib ( + H5PartFile *f, + const char *name, + const hid_t type, + const void *value, + const hsize_t nelem + ); + h5part_int64_t _H5Part_get_attrib_info ( hid_t id, diff --git a/test/read.c b/test/read.c index 213097d..6bf1c8e 100644 --- a/test/read.c +++ b/test/read.c @@ -1,3 +1,4 @@ +#include #include #include "testframe.h" diff --git a/test/testframe.c b/test/testframe.c index d4fb73b..a003c4c 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -536,7 +536,7 @@ TestPrintf(const char *format, ...) int nproc; MPI_Comm_rank(MPI_COMM_WORLD, &nproc); if ( nproc == 0 || VERBOSE_HI ) { - char *format2 = malloc(strlen(format)+8); + char *format2 = (char*)malloc(strlen(format)+8); sprintf(format2, "[%d] %s", nproc, format); va_start(arglist, format); ret_value = vprintf(format2, arglist); @@ -570,7 +570,7 @@ TestErrPrintf(const char *format, ...) int nproc; MPI_Comm_rank(MPI_COMM_WORLD, &nproc); if ( nproc == 0 || VERBOSE_HI ) { - char *format2 = malloc(strlen(format)+8); + char *format2 = (char*)malloc(strlen(format)+8); sprintf(format2, "[%d] %s", nproc, format); va_start(arglist, format); ret_value = vfprintf(stderr, format2, arglist); diff --git a/test/testframe.h b/test/testframe.h index 04a734a..652191a 100644 --- a/test/testframe.h +++ b/test/testframe.h @@ -6,6 +6,8 @@ #ifndef _H5PART_TESTFRAME_H_ #define _H5PART_TESTFRAME_H_ +#include + #ifdef PARALLEL_IO #define OPEN(file,mode) \ H5PartOpenFileParallel(file,mode,MPI_COMM_WORLD)