summaryrefslogtreecommitdiffstats
path: root/perform/sio_engine.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-09-16 16:22:16 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-09-16 16:22:16 (GMT)
commitb9be0455961ca1098bc4977bf1138394932b75db (patch)
tree8bf7377bbda85d614e4e5984c5a1a59ac323310e /perform/sio_engine.c
parent37a1f87664a1b2026e1d2a1dd5033eb2e8b1f5fc (diff)
downloadhdf5-b9be0455961ca1098bc4977bf1138394932b75db.zip
hdf5-b9be0455961ca1098bc4977bf1138394932b75db.tar.gz
hdf5-b9be0455961ca1098bc4977bf1138394932b75db.tar.bz2
[svn-r15629] Description:
Remove trailing whitespace from C/C++ source files, with the following script: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Tested on: Mac OS X/32 10.5.5 (amazon) No need for h5committest, just whitespace changes...
Diffstat (limited to 'perform/sio_engine.c')
-rw-r--r--perform/sio_engine.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/perform/sio_engine.c b/perform/sio_engine.c
index bcddfdc..a6a7fa1 100644
--- a/perform/sio_engine.c
+++ b/perform/sio_engine.c
@@ -13,7 +13,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
- * Author: Christian Chilan, April 2008
+ * Author: Christian Chilan, April 2008
*/
#include <sys/types.h>
@@ -122,7 +122,7 @@ static off_t offset[MAX_DIMS]; /* dataset size in bytes */
static size_t buf_offset[MAX_DIMS]; /* dataset size in bytes */
static int order[MAX_DIMS]; /* dimension access order */
static size_t linear_buf_size; /* linear buffer size */
-static int cont_dim; /* lowest dimension for contiguous POSIX
+static int cont_dim; /* lowest dimension for contiguous POSIX
access */
static size_t cont_size; /* size of contiguous POSIX access */
static hid_t fapl; /* file access list */
@@ -144,7 +144,7 @@ static hid_t h5dxpl = -1; /* Dataset transfer property list */
* Function: do_sio
* Purpose: SIO Engine where IO are executed.
* Return: results
- * Programmer: Christian Chilan, April, 2008
+ * Programmer: Christian Chilan, April, 2008
* Modifications:
*/
results
@@ -187,7 +187,7 @@ do_sio(parameters param)
GOTOERROR(FAIL);
}
- nbytes = param.num_bytes;
+ nbytes = param.num_bytes;
linear_buf_size = 1;
for (i=0; i<param.rank; i++){
@@ -217,14 +217,14 @@ do_sio(parameters param)
}
/* Allocate transfer buffer */
- buffer2 = malloc(linear_buf_size);
+ buffer2 = malloc(linear_buf_size);
if ((buffer = malloc(linear_buf_size)) == NULL){
HDfprintf(stderr, "malloc for transfer buffer size (%Hd) failed\n",
(long_long)(linear_buf_size));
GOTOERROR(FAIL);
}
- if (sio_debug_level >= 4)
+ if (sio_debug_level >= 4)
/* output all of the times for all iterations */
fprintf(output, "Timer details:\n");
@@ -276,7 +276,7 @@ do_sio(parameters param)
set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, STOP);
VRFY((hrc == SUCCESS), "do_fclose failed");
}
-
+
do_cleanupfile(iot, fname);
done:
@@ -320,8 +320,8 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
const char *prefix, *suffix="";
char *ptr, last = '\0';
size_t i, j;
- vfdtype vfd;
- vfd = param->vfd;
+ vfdtype vfd;
+ vfd = param->vfd;
if (!base_name || !fullname || size < 1)
return NULL;
@@ -422,7 +422,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
* Function: do_write
* Purpose: Write the required amount of data to the file.
* Return: SUCCESS or FAIL
- * Programmer: Christian Chilan, April, 2008
+ * Programmer: Christian Chilan, April, 2008
* Modifications:
*/
static herr_t
@@ -461,7 +461,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
/* determine lowest dimension for contiguous POSIX access */
cont_dim = rank;
-
+
for (i=rank-1; i>=0; i--) {
if (parms->buf_size[i]==parms->dset_size[i])
cont_dim = i;
@@ -469,7 +469,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
break;
}
- /* determine size of the contiguous POSIX access */
+ /* determine size of the contiguous POSIX access */
cont_size = (!cont_dim)? 1 : parms->buf_size[cont_dim-1];
for (i=cont_dim; i<rank; i++)
cont_size *= parms->buf_size[i];
@@ -486,7 +486,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
h5count[i] = parms->buf_size[i];
h5chunk[i] = parms->chk_size[i];
h5maxdims[i] = H5S_UNLIMITED;
-
+
}
if (parms->h5_use_chunks && parms->h5_extendable) {
@@ -499,7 +499,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
}
hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
- h5start, h5stride, h5count, h5block);
+ h5start, h5stride, h5count, h5block);
VRFY((hrc >= 0), "H5Sselect_hyperslab");
/* Create the memory dataspace that corresponds to the xfer buffer */
@@ -513,7 +513,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
GOTOERROR(FAIL);
}
- break;
+ break;
} /* end switch */
@@ -563,7 +563,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
/* Perform write */
hrc = dset_write(rank-1, fd, parms, buffer);
-
+
if (hrc < 0) {
fprintf(stderr, "Error in dataset write\n");
GOTOERROR(FAIL);
@@ -625,7 +625,7 @@ done:
/*
* Function: dset_write
- * Purpose: Write buffer into the dataset.
+ * Purpose: Write buffer into the dataset.
* Return: SUCCESS or FAIL
* Programmer: Christian Chilan, April, 2008
* Modifications:
@@ -640,11 +640,11 @@ static herr_t dset_write(int local_dim, file_descr *fd, parameters *parms, void
long i,j;
herr_t hrc;
- /* iterates according to the dimensions in order array */
+ /* iterates according to the dimensions in order array */
for (i=0; i < parms->dset_size[cur_dim]; i += parms->buf_size[cur_dim]){
h5offset[cur_dim] = offset[cur_dim] = i;
-
+
if (local_dim > 0){
dset_write(local_dim-1, fd, parms, buffer);
@@ -682,7 +682,7 @@ static herr_t dset_write(int local_dim, file_descr *fd, parameters *parms, void
}
}
}
- /* applies offset */
+ /* applies offset */
hrc = H5Soffset_simple(h5dset_space_id, h5offset);
VRFY((hrc >= 0), "H5Soffset_simple");
@@ -701,7 +701,7 @@ done:
}
/*
- * Function: posix_buffer_write
+ * Function: posix_buffer_write
* Purpose: Write buffer into the POSIX file considering contiguity.
* Return: SUCCESS or FAIL
* Programmer: Christian Chilan, April, 2008
@@ -765,7 +765,7 @@ done:
* Function: do_read
* Purpose: Read the required amount of data to the file.
* Return: SUCCESS or FAIL
- * Programmer: Christian Chilan, April, 2008
+ * Programmer: Christian Chilan, April, 2008
* Modifications:
*/
static herr_t
@@ -796,7 +796,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
switch (parms->io_type) {
case POSIXIO:
cont_dim = rank;
-
+
for (i=rank-1; i>=0; i--) {
if (parms->buf_size[i]==parms->dset_size[i])
cont_dim = i;
@@ -823,7 +823,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
VRFY((h5dset_space_id >= 0), "H5Screate_simple");
hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
- h5start, h5stride, h5count, h5block);
+ h5start, h5stride, h5count, h5block);
VRFY((hrc >= 0), "H5Sselect_hyperslab");
/* Create the memory dataspace that corresponds to the xfer buffer */
@@ -837,7 +837,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
GOTOERROR(FAIL);
}
- break;
+ break;
} /* end switch */
@@ -935,12 +935,12 @@ static herr_t dset_read(int local_dim, file_descr *fd, parameters *parms, void *
long i,j;
herr_t hrc;
- /* iterate on the current dimension */
+ /* iterate on the current dimension */
for (i=0; i < parms->dset_size[cur_dim]; i += parms->buf_size[cur_dim]){
h5offset[cur_dim] = offset[cur_dim] = i;
-
- /* if traverse in order array is incomplete, recurse */
+
+ /* if traverse in order array is incomplete, recurse */
if (local_dim > 0){
ret_code = dset_read(local_dim-1, fd, parms, buffer);
@@ -966,7 +966,7 @@ static herr_t dset_read(int local_dim, file_descr *fd, parameters *parms, void *
hrc = H5Dread(h5ds_id, ELMT_H5_TYPE, h5mem_space_id,
h5dset_space_id, h5dxpl, buffer);
VRFY((hrc >= 0), "H5Dread");
-#if 0
+#if 0
for (j=0; j<linear_buf_size; j++) {
buf_p = (unsigned char*)buffer;
if (buf_p[j]!=buffer2[j])
@@ -1028,7 +1028,7 @@ static herr_t posix_buffer_read(int local_dim, file_descr *fd, parameters *parms
rc = ((ssize_t)cont_size ==
POSIXREAD(fd->posixfd, buf_p, cont_size));
VRFY((rc != 0), "POSIXREAD");
-#if 0
+#if 0
for (j=0; j<cont_size; j++) {
if (buf_p[j]!=buf2_p[j])
printf("Inconsistent data in %d\n", j);
@@ -1093,18 +1093,18 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
GOTOERROR(FAIL);
}
break;
- }
+ }
done:
return ret_code;
}
/*
- * Function: set_vfd
- * Purpose: Sets file driver.
+ * Function: set_vfd
+ * Purpose: Sets file driver.
* Return: SUCCESS or FAIL
- * Programmer: Christian Chilan, April, 2008
- * Modifications:
+ * Programmer: Christian Chilan, April, 2008
+ * Modifications:
*/
hid_t
@@ -1281,7 +1281,7 @@ do_cleanupfile(iotype iot, char *filename)
}
H5Pclose(fapl);
break;
- }
+ }
}
}