summaryrefslogtreecommitdiffstats
path: root/src/H5FDros3.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5FDros3.c')
-rw-r--r--src/H5FDros3.c511
1 files changed, 237 insertions, 274 deletions
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index c024716..fa41b6f 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -25,14 +25,14 @@
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5FDprivate.h" /* File drivers */
-#include "H5FDros3.h" /* ros3 file driver */
-#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5FDs3comms.h" /* S3 Communications */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5FDprivate.h" /* File drivers */
+#include "H5FDros3.h" /* ros3 file driver */
+#include "H5FLprivate.h" /* Free Lists */
+#include "H5Iprivate.h" /* IDs */
+#include "H5MMprivate.h" /* Memory management */
+#include "H5FDs3comms.h" /* S3 Communications */
#ifdef H5_HAVE_ROS3_VFD
@@ -63,29 +63,27 @@ static hid_t H5FD_ROS3_g = 0;
* 2^(10+(1*16)) = 2^26 = 64MB
* Reads of 64MB or greater fall in "overflow" bin[BIN_COUNT]
*/
-#define ROS3_STATS_BASE 2
-#define ROS3_STATS_INTERVAL 1
+#define ROS3_STATS_BASE 2
+#define ROS3_STATS_INTERVAL 1
#define ROS3_STATS_START_POWER 10
#define ROS3_STATS_BIN_COUNT 16 /* MUST BE GREATER THAN 0 */
-
/*
* Calculate `BASE ^ (START_POWER + (INTERVAL * bin_i))`
* Stores result at `(unsigned long long *) out_ptr`.
* Used in computing boundaries between stats bins.
*/
-#define ROS3_STATS_POW(bin_i, out_ptr) { \
- unsigned long long donotshadowresult = 1; \
- unsigned donotshadowindex = 0; \
- for (donotshadowindex = 0; \
- donotshadowindex < (((bin_i) * ROS3_STATS_INTERVAL) + \
- ROS3_STATS_START_POWER); \
- donotshadowindex++) \
- { \
- donotshadowresult *= ROS3_STATS_BASE; \
- } \
- *(out_ptr) = donotshadowresult; \
-}
+#define ROS3_STATS_POW(bin_i, out_ptr) \
+ { \
+ unsigned long long donotshadowresult = 1; \
+ unsigned donotshadowindex = 0; \
+ for (donotshadowindex = 0; \
+ donotshadowindex < (((bin_i)*ROS3_STATS_INTERVAL) + ROS3_STATS_START_POWER); \
+ donotshadowindex++) { \
+ donotshadowresult *= ROS3_STATS_BASE; \
+ } \
+ *(out_ptr) = donotshadowresult; \
+ }
/* array to hold pre-computed boundaries for stats bins
*/
@@ -192,13 +190,13 @@ typedef struct {
*
***************************************************************************/
typedef struct H5FD_ros3_t {
- H5FD_t pub;
- H5FD_ros3_fapl_t fa;
- haddr_t eoa;
- s3r_t *s3r_handle;
+ H5FD_t pub;
+ H5FD_ros3_fapl_t fa;
+ haddr_t eoa;
+ s3r_t * s3r_handle;
#if ROS3_STATS
- ros3_statsbin meta[ROS3_STATS_BIN_COUNT + 1];
- ros3_statsbin raw[ROS3_STATS_BIN_COUNT + 1];
+ ros3_statsbin meta[ROS3_STATS_BIN_COUNT + 1];
+ ros3_statsbin raw[ROS3_STATS_BIN_COUNT + 1];
#endif
} H5FD_ros3_t;
@@ -212,74 +210,70 @@ typedef struct H5FD_ros3_t {
* Only included if it may be used -- ROS3 VFD is enabled.
*
*/
-#define MAXADDR (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
-#define ADDR_OVERFLOW(A) (HADDR_UNDEF==(A) || ((A) & ~(haddr_t)MAXADDR))
+#define MAXADDR (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
/* Prototypes */
static herr_t H5FD__ros3_term(void);
-static void *H5FD__ros3_fapl_get(H5FD_t *_file);
-static void *H5FD__ros3_fapl_copy(const void *_old_fa);
+static void * H5FD__ros3_fapl_get(H5FD_t *_file);
+static void * H5FD__ros3_fapl_copy(const void *_old_fa);
static herr_t H5FD__ros3_fapl_free(void *_fa);
-static H5FD_t *H5FD__ros3_open(const char *name, unsigned flags, hid_t fapl_id,
- haddr_t maxaddr);
+static H5FD_t *H5FD__ros3_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
static herr_t H5FD__ros3_close(H5FD_t *_file);
static int H5FD__ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
static herr_t H5FD__ros3_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD__ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
static herr_t H5FD__ros3_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
static haddr_t H5FD__ros3_get_eof(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD__ros3_get_handle(H5FD_t *_file, hid_t fapl,
- void** file_handle);
-static herr_t H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
- haddr_t addr, size_t size, void *buf);
-static herr_t H5FD__ros3_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
- haddr_t addr, size_t size, const void *buf);
-static herr_t H5FD__ros3_truncate(H5FD_t *_file, hid_t dxpl_id,
- hbool_t closing);
+static herr_t H5FD__ros3_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+ void *buf);
+static herr_t H5FD__ros3_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+ const void *buf);
+static herr_t H5FD__ros3_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
static herr_t H5FD__ros3_lock(H5FD_t *_file, hbool_t rw);
static herr_t H5FD__ros3_unlock(H5FD_t *_file);
-static herr_t H5FD__ros3_validate_config(const H5FD_ros3_fapl_t * fa);
+static herr_t H5FD__ros3_validate_config(const H5FD_ros3_fapl_t *fa);
static const H5FD_class_t H5FD_ros3_g = {
- "ros3", /* name */
- MAXADDR, /* maxaddr */
- H5F_CLOSE_WEAK, /* fc_degree */
- H5FD__ros3_term, /* terminate */
- NULL, /* sb_size */
- NULL, /* sb_encode */
- NULL, /* sb_decode */
- sizeof(H5FD_ros3_fapl_t), /* fapl_size */
- H5FD__ros3_fapl_get, /* fapl_get */
- H5FD__ros3_fapl_copy, /* fapl_copy */
- H5FD__ros3_fapl_free, /* fapl_free */
- 0, /* dxpl_size */
- NULL, /* dxpl_copy */
- NULL, /* dxpl_free */
- H5FD__ros3_open, /* open */
- H5FD__ros3_close, /* close */
- H5FD__ros3_cmp, /* cmp */
- H5FD__ros3_query, /* query */
- NULL, /* get_type_map */
- NULL, /* alloc */
- NULL, /* free */
- H5FD__ros3_get_eoa, /* get_eoa */
- H5FD__ros3_set_eoa, /* set_eoa */
- H5FD__ros3_get_eof, /* get_eof */
- H5FD__ros3_get_handle, /* get_handle */
- H5FD__ros3_read, /* read */
- H5FD__ros3_write, /* write */
- NULL, /* flush */
- H5FD__ros3_truncate, /* truncate */
- H5FD__ros3_lock, /* lock */
- H5FD__ros3_unlock, /* unlock */
- H5FD_FLMAP_DICHOTOMY /* fl_map */
+ "ros3", /* name */
+ MAXADDR, /* maxaddr */
+ H5F_CLOSE_WEAK, /* fc_degree */
+ H5FD__ros3_term, /* terminate */
+ NULL, /* sb_size */
+ NULL, /* sb_encode */
+ NULL, /* sb_decode */
+ sizeof(H5FD_ros3_fapl_t), /* fapl_size */
+ H5FD__ros3_fapl_get, /* fapl_get */
+ H5FD__ros3_fapl_copy, /* fapl_copy */
+ H5FD__ros3_fapl_free, /* fapl_free */
+ 0, /* dxpl_size */
+ NULL, /* dxpl_copy */
+ NULL, /* dxpl_free */
+ H5FD__ros3_open, /* open */
+ H5FD__ros3_close, /* close */
+ H5FD__ros3_cmp, /* cmp */
+ H5FD__ros3_query, /* query */
+ NULL, /* get_type_map */
+ NULL, /* alloc */
+ NULL, /* free */
+ H5FD__ros3_get_eoa, /* get_eoa */
+ H5FD__ros3_set_eoa, /* set_eoa */
+ H5FD__ros3_get_eof, /* get_eof */
+ H5FD__ros3_get_handle, /* get_handle */
+ H5FD__ros3_read, /* read */
+ H5FD__ros3_write, /* write */
+ NULL, /* flush */
+ H5FD__ros3_truncate, /* truncate */
+ H5FD__ros3_lock, /* lock */
+ H5FD__ros3_unlock, /* unlock */
+ H5FD_FLMAP_DICHOTOMY /* fl_map */
};
/* Declare a free list to manage the H5FD_ros3_t struct */
H5FL_DEFINE_STATIC(H5FD_ros3_t);
-
/*-------------------------------------------------------------------------
* Function: H5FD__init_package
*
@@ -298,14 +292,13 @@ H5FD__init_package(void)
FUNC_ENTER_STATIC
- if(H5FD_ros3_init() < 0)
+ if (H5FD_ros3_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize ros3 VFD")
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__init_package() */
-
/*-------------------------------------------------------------------------
* Function: H5FD_ros3_init
*
@@ -333,7 +326,7 @@ H5FD_ros3_init(void)
HDfprintf(stdout, "H5FD_ros3_init() called.\n");
#endif
- if(H5I_VFL != H5I_get_type(H5FD_ROS3_g))
+ if (H5I_VFL != H5I_get_type(H5FD_ROS3_g))
H5FD_ROS3_g = H5FD_register(&H5FD_ros3_g, sizeof(H5FD_class_t), FALSE);
#if ROS3_STATS
@@ -354,7 +347,6 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_ros3_init() */
-
/*---------------------------------------------------------------------------
* Function: H5FD__ros3_term
*
@@ -381,7 +373,6 @@ H5FD__ros3_term(void)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__ros3_term() */
-
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_ros3
*
@@ -413,10 +404,10 @@ H5Pset_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa)
#endif
plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
- if(plist == NULL)
+ if (plist == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
- if(FAIL == H5FD__ros3_validate_config(fa))
+ if (FAIL == H5FD__ros3_validate_config(fa))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid ros3 config")
ret_value = H5P_set_driver(plist, H5FD_ROS3, (void *)fa);
@@ -425,7 +416,6 @@ done:
FUNC_LEAVE_API(ret_value)
} /* end H5Pset_fapl_ros3() */
-
/*-------------------------------------------------------------------------
* Function: H5FD__ros3_validate_config()
*
@@ -447,7 +437,7 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD__ros3_validate_config(const H5FD_ros3_fapl_t * fa)
+H5FD__ros3_validate_config(const H5FD_ros3_fapl_t *fa)
{
herr_t ret_value = SUCCEED;
@@ -455,19 +445,18 @@ H5FD__ros3_validate_config(const H5FD_ros3_fapl_t * fa)
HDassert(fa != NULL);
- if(fa->version != H5FD_CURR_ROS3_FAPL_T_VERSION)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown H5FD_ros3_fapl_t version");
+ if (fa->version != H5FD_CURR_ROS3_FAPL_T_VERSION)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown H5FD_ros3_fapl_t version");
/* if set to authenticate, region and id cannot be empty strings */
- if(fa->authenticate == TRUE)
- if((fa->aws_region[0] == '\0') || (fa->secret_id[0] == '\0'))
+ if (fa->authenticate == TRUE)
+ if ((fa->aws_region[0] == '\0') || (fa->secret_id[0] == '\0'))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Inconsistent authentication information");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ros3_validate_config() */
-
/*-------------------------------------------------------------------------
* Function: H5Pget_fapl_ros3
*
@@ -487,7 +476,7 @@ herr_t
H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out)
{
const H5FD_ros3_fapl_t *fa = NULL;
- H5P_genplist_t *plist = NULL;
+ H5P_genplist_t * plist = NULL;
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
@@ -497,18 +486,18 @@ H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out)
HDfprintf(stdout, "H5Pget_fapl_ros3() called.\n");
#endif
- if(fa_out == NULL)
+ if (fa_out == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_out is NULL")
plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
- if(plist == NULL)
+ if (plist == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
- if(H5FD_ROS3 != H5P_peek_driver(plist))
+ if (H5FD_ROS3 != H5P_peek_driver(plist))
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
fa = (const H5FD_ros3_fapl_t *)H5P_peek_driver_info(plist);
- if(fa == NULL)
+ if (fa == NULL)
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
/* Copy the ros3 fapl data out */
@@ -518,7 +507,6 @@ done:
FUNC_LEAVE_API(ret_value)
} /* end H5Pget_fapl_ros3() */
-
/*-------------------------------------------------------------------------
* Function: H5FD__ros3_fapl_get
*
@@ -537,14 +525,14 @@ done:
static void *
H5FD__ros3_fapl_get(H5FD_t *_file)
{
- H5FD_ros3_t *file = (H5FD_ros3_t*)_file;
+ H5FD_ros3_t * file = (H5FD_ros3_t *)_file;
H5FD_ros3_fapl_t *fa = NULL;
- void *ret_value = NULL;
+ void * ret_value = NULL;
FUNC_ENTER_STATIC
fa = (H5FD_ros3_fapl_t *)H5MM_calloc(sizeof(H5FD_ros3_fapl_t));
- if(fa == NULL)
+ if (fa == NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
/* Copy the fields of the structure */
@@ -554,14 +542,13 @@ H5FD__ros3_fapl_get(H5FD_t *_file)
ret_value = fa;
done:
- if(ret_value == NULL)
- if(fa != NULL)
+ if (ret_value == NULL)
+ if (fa != NULL)
H5MM_xfree(fa);
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ros3_fapl_get() */
-
/*-------------------------------------------------------------------------
* Function: H5FD__ros3_fapl_copy
*
@@ -579,28 +566,27 @@ done:
static void *
H5FD__ros3_fapl_copy(const void *_old_fa)
{
- const H5FD_ros3_fapl_t *old_fa = (const H5FD_ros3_fapl_t*)_old_fa;
- H5FD_ros3_fapl_t *new_fa = NULL;
- void *ret_value = NULL;
+ const H5FD_ros3_fapl_t *old_fa = (const H5FD_ros3_fapl_t *)_old_fa;
+ H5FD_ros3_fapl_t * new_fa = NULL;
+ void * ret_value = NULL;
FUNC_ENTER_STATIC
new_fa = (H5FD_ros3_fapl_t *)H5MM_malloc(sizeof(H5FD_ros3_fapl_t));
- if(new_fa == NULL)
+ if (new_fa == NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
HDmemcpy(new_fa, old_fa, sizeof(H5FD_ros3_fapl_t));
ret_value = new_fa;
done:
- if(ret_value == NULL)
- if(new_fa != NULL)
+ if (ret_value == NULL)
+ if (new_fa != NULL)
H5MM_xfree(new_fa);
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ros3_fapl_copy() */
-
/*-------------------------------------------------------------------------
* Function: H5FD__ros3_fapl_free
*
@@ -616,7 +602,7 @@ done:
static herr_t
H5FD__ros3_fapl_free(void *_fa)
{
- H5FD_ros3_fapl_t *fa = (H5FD_ros3_fapl_t*)_fa;
+ H5FD_ros3_fapl_t *fa = (H5FD_ros3_fapl_t *)_fa;
FUNC_ENTER_STATIC_NOERR
@@ -661,14 +647,14 @@ ros3_reset_stats(H5FD_ros3_t *file)
HDprintf("ros3_reset_stats() called\n");
#endif
- if(file == NULL)
+ if (file == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file was null");
- for(i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
- file->raw[i].bytes = 0;
- file->raw[i].count = 0;
- file->raw[i].min = (unsigned long long)ROS3_STATS_STARTING_MIN;
- file->raw[i].max = 0;
+ for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
+ file->raw[i].bytes = 0;
+ file->raw[i].count = 0;
+ file->raw[i].min = (unsigned long long)ROS3_STATS_STARTING_MIN;
+ file->raw[i].max = 0;
file->meta[i].bytes = 0;
file->meta[i].count = 0;
@@ -681,7 +667,6 @@ done:
} /* end ros3_reset_stats() */
#endif /* ROS3_STATS */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_open()
@@ -716,13 +701,13 @@ done:
static H5FD_t *
H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
{
- H5FD_ros3_t *file = NULL;
- struct tm *now = NULL;
- char iso8601now[ISO8601_SIZE];
- unsigned char signing_key[SHA256_DIGEST_LENGTH];
- s3r_t *handle = NULL;
- H5FD_ros3_fapl_t fa;
- H5FD_t *ret_value = NULL;
+ H5FD_ros3_t * file = NULL;
+ struct tm * now = NULL;
+ char iso8601now[ISO8601_SIZE];
+ unsigned char signing_key[SHA256_DIGEST_LENGTH];
+ s3r_t * handle = NULL;
+ H5FD_ros3_fapl_t fa;
+ H5FD_t * ret_value = NULL;
FUNC_ENTER_STATIC
@@ -734,44 +719,44 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
/* Check arguments */
- if(!url || !*url)
+ if (!url || !*url)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
- if(0 == maxaddr || HADDR_UNDEF == maxaddr)
+ if (0 == maxaddr || HADDR_UNDEF == maxaddr)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
- if(ADDR_OVERFLOW(maxaddr))
+ if (ADDR_OVERFLOW(maxaddr))
HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr")
- if(flags != H5F_ACC_RDONLY)
+ if (flags != H5F_ACC_RDONLY)
HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, NULL, "only Read-Only access allowed")
- if(FAIL == H5Pget_fapl_ros3(fapl_id, &fa))
+ if (FAIL == H5Pget_fapl_ros3(fapl_id, &fa))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "can't get property list")
- if(CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT))
+ if (CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to initialize curl global (placeholder flags)")
/* open file; procedure depends on whether or not the fapl instructs to
* authenticate requests or not.
*/
- if(fa.authenticate == TRUE) {
+ if (fa.authenticate == TRUE) {
/* compute signing key (part of AWS/S3 REST API)
* can be re-used by user/key for 7 days after creation.
* find way to re-use/share
*/
now = gmnow();
- HDassert( now != NULL );
- if(ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
+ HDassert(now != NULL);
+ if (ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "problem while writing iso8601 timestamp")
- if(FAIL == H5FD_s3comms_signing_key(signing_key, (const char *)fa.secret_key,
- (const char *)fa.aws_region, (const char *)iso8601now))
+ if (FAIL == H5FD_s3comms_signing_key(signing_key, (const char *)fa.secret_key,
+ (const char *)fa.aws_region, (const char *)iso8601now))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "problem while computing signing key")
- handle = H5FD_s3comms_s3r_open( url, (const char *)fa.aws_region,
- (const char *)fa.secret_id, (const unsigned char *)signing_key);
+ handle = H5FD_s3comms_s3r_open(url, (const char *)fa.aws_region, (const char *)fa.secret_id,
+ (const unsigned char *)signing_key);
}
else
handle = H5FD_s3comms_s3r_open(url, NULL, NULL, NULL);
- if(handle == NULL)
+ if (handle == NULL)
/* If we want to check CURL's say on the matter in a controlled
* fashion, this is the place to do it, but would need to make a
* few minor changes to s3comms `s3r_t` and `s3r_read()`.
@@ -780,28 +765,28 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
/* create new file struct */
file = H5FL_CALLOC(H5FD_ros3_t);
- if(file == NULL)
+ if (file == NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
file->s3r_handle = handle;
HDmemcpy(&(file->fa), &fa, sizeof(H5FD_ros3_fapl_t));
#if ROS3_STATS
- if(FAIL == ros3_reset_stats(file))
+ if (FAIL == ros3_reset_stats(file))
HGOTO_ERROR(H5E_INTERNAL, H5E_UNINITIALIZED, NULL, "unable to reset file statistics")
#endif /* ROS3_STATS */
- ret_value = (H5FD_t*)file;
+ ret_value = (H5FD_t *)file;
done:
- if(ret_value == NULL) {
- if(handle != NULL)
- if(FAIL == H5FD_s3comms_s3r_close(handle))
+ if (ret_value == NULL) {
+ if (handle != NULL)
+ if (FAIL == H5FD_s3comms_s3r_close(handle))
HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL, "unable to close s3 file handle")
- if(file != NULL)
+ if (file != NULL)
file = H5FL_FREE(H5FD_ros3_t, file);
curl_global_cleanup(); /* early cleanup because open failed */
- } /* end if null return value (error) */
+ } /* end if null return value (error) */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ros3_open() */
@@ -865,31 +850,31 @@ static herr_t
ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
{
herr_t ret_value = SUCCEED;
- parsed_url_t *purl = NULL;
+ parsed_url_t * purl = NULL;
unsigned i = 0;
unsigned long count_meta = 0;
unsigned long count_raw = 0;
double average_meta = 0.0;
double average_raw = 0.0;
- unsigned long long min_meta = (unsigned long long)ROS3_STATS_STARTING_MIN;
- unsigned long long min_raw = (unsigned long long)ROS3_STATS_STARTING_MIN;
+ unsigned long long min_meta = (unsigned long long)ROS3_STATS_STARTING_MIN;
+ unsigned long long min_raw = (unsigned long long)ROS3_STATS_STARTING_MIN;
unsigned long long max_meta = 0;
unsigned long long max_raw = 0;
unsigned long long bytes_raw = 0;
unsigned long long bytes_meta = 0;
double re_dub = 0.0; /* re-usable double variable */
unsigned suffix_i = 0;
- const char suffixes[] = { ' ', 'K', 'M', 'G', 'T', 'P' };
+ const char suffixes[] = {' ', 'K', 'M', 'G', 'T', 'P'};
FUNC_ENTER_STATIC
- if(stream == NULL)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file stream cannot be null" );
- if(file == NULL)
+ if (stream == NULL)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file stream cannot be null");
+ if (file == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file cannot be null");
- if(file->s3r_handle == NULL)
+ if (file->s3r_handle == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "s3 request handle cannot be null");
- if(file->s3r_handle->purl == NULL)
+ if (file->s3r_handle->purl == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "parsed url structure cannot be null");
purl = file->s3r_handle->purl;
@@ -898,15 +883,16 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
******************/
HDfprintf(stream, "stats for %s://%s", purl->scheme, purl->host);
- if(purl->port != NULL && purl->port[0] != '\0')
+ if (purl->port != NULL && purl->port[0] != '\0')
HDfprintf(stream, ":%s", purl->port);
- if(purl->query != NULL && purl->query[0] != '\0') {
+ if (purl->query != NULL && purl->query[0] != '\0') {
if (purl->path != NULL && purl->path[0] != '\0')
HDfprintf(stream, "/%s", purl->path);
else
HDfprintf(stream, "/");
HDfprintf(stream, "?%s", purl->query);
- } else if (purl->path != NULL && purl->path[0] != '\0') {
+ }
+ else if (purl->path != NULL && purl->path[0] != '\0') {
HDfprintf(stream, "/%s", purl->path);
}
HDfprintf(stream, "\n");
@@ -915,39 +901,39 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
* AGGREGATE STATS *
*******************/
- for(i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
+ for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
const ros3_statsbin *r = &file->raw[i];
const ros3_statsbin *m = &file->meta[i];
- if(m->min < min_meta)
+ if (m->min < min_meta)
min_meta = m->min;
- if(r->min < min_raw)
- min_raw = r->min;
- if(m->max > max_meta)
+ if (r->min < min_raw)
+ min_raw = r->min;
+ if (m->max > max_meta)
max_meta = m->max;
- if(r->max > max_raw)
- max_raw = r->max;
+ if (r->max > max_raw)
+ max_raw = r->max;
- count_raw += r->count;
+ count_raw += r->count;
count_meta += m->count;
- bytes_raw += r->bytes;
+ bytes_raw += r->bytes;
bytes_meta += m->bytes;
}
- if(count_raw > 0)
+ if (count_raw > 0)
average_raw = (double)bytes_raw / (double)count_raw;
- if(count_meta > 0)
+ if (count_meta > 0)
average_meta = (double)bytes_meta / (double)count_meta;
/******************
* PRINT OVERVIEW *
******************/
- HDfprintf(stream, "TOTAL READS: %llu (%llu meta, %llu raw)\n",
- count_raw + count_meta, count_meta, count_raw);
- HDfprintf(stream, "TOTAL BYTES: %llu (%llu meta, %llu raw)\n",
- bytes_raw + bytes_meta, bytes_meta, bytes_raw);
+ HDfprintf(stream, "TOTAL READS: %llu (%llu meta, %llu raw)\n", count_raw + count_meta, count_meta,
+ count_raw);
+ HDfprintf(stream, "TOTAL BYTES: %llu (%llu meta, %llu raw)\n", bytes_raw + bytes_meta, bytes_meta,
+ bytes_raw);
- if(count_raw + count_meta == 0)
+ if (count_raw + count_meta == 0)
goto done;
/*************************
@@ -956,21 +942,21 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
HDfprintf(stream, "SIZES meta raw\n");
HDfprintf(stream, " min ");
- if(count_meta == 0)
+ if (count_meta == 0)
HDfprintf(stream, " 0.000 ");
else {
re_dub = (double)min_meta;
- for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+ for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
re_dub /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
}
- if(count_raw == 0)
+ if (count_raw == 0)
HDfprintf(stream, " 0.000 \n");
else {
re_dub = (double)min_raw;
- for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+ for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
re_dub /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
@@ -978,26 +964,26 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
HDfprintf(stream, " avg ");
re_dub = (double)average_meta;
- for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+ for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
re_dub /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
re_dub = (double)average_raw;
- for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+ for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
re_dub /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
HDfprintf(stream, " max ");
re_dub = (double)max_meta;
- for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+ for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
re_dub /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
re_dub = (double)max_raw;
- for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+ for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
re_dub /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
@@ -1006,12 +992,10 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
* PRINT INDIVIDUAL BIN STATS *
******************************/
- HDfprintf(stream,
- "BINS # of reads total bytes average size\n");
- HDfprintf(stream,
- " up-to meta raw meta raw meta raw\n");
+ HDfprintf(stream, "BINS # of reads total bytes average size\n");
+ HDfprintf(stream, " up-to meta raw meta raw meta raw\n");
- for(i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
+ for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
const ros3_statsbin *m;
const ros3_statsbin *r;
unsigned long long range_end = 0;
@@ -1026,58 +1010,57 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
m = &file->meta[i];
r = &file->raw[i];
- if(r->count == 0 && m->count == 0)
+ if (r->count == 0 && m->count == 0)
continue;
range_end = ros3_stats_boundaries[i];
- if(i == ROS3_STATS_BIN_COUNT) {
- range_end = ros3_stats_boundaries[i-1];
+ if (i == ROS3_STATS_BIN_COUNT) {
+ range_end = ros3_stats_boundaries[i - 1];
HDfprintf(stream, ">");
}
else
HDfprintf(stream, " ");
bm_val = (double)m->bytes;
- for(suffix_i = 0; bm_val >= 1024.0; suffix_i++)
+ for (suffix_i = 0; bm_val >= 1024.0; suffix_i++)
bm_val /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
bm_suffix = suffixes[suffix_i];
br_val = (double)r->bytes;
- for(suffix_i = 0; br_val >= 1024.0; suffix_i++)
+ for (suffix_i = 0; br_val >= 1024.0; suffix_i++)
br_val /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
br_suffix = suffixes[suffix_i];
- if(m->count > 0)
+ if (m->count > 0)
am_val = (double)(m->bytes) / (double)(m->count);
- for(suffix_i = 0; am_val >= 1024.0; suffix_i++)
+ for (suffix_i = 0; am_val >= 1024.0; suffix_i++)
am_val /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
am_suffix = suffixes[suffix_i];
- if(r->count > 0)
+ if (r->count > 0)
ar_val = (double)(r->bytes) / (double)(r->count);
- for(suffix_i = 0; ar_val >= 1024.0; suffix_i++)
+ for (suffix_i = 0; ar_val >= 1024.0; suffix_i++)
ar_val /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
ar_suffix = suffixes[suffix_i];
re_dub = (double)range_end;
- for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+ for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
re_dub /= 1024.0;
HDassert(suffix_i < sizeof(suffixes));
- HDfprintf(stream,
- " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n",
- re_dub, suffixes[suffix_i], /* bin ceiling */
- m->count, /* metadata reads */
- r->count, /* rawdata reads */
- bm_val, bm_suffix, /* metadata bytes */
- br_val, br_suffix, /* rawdata bytes */
- am_val, am_suffix, /* metadata average */
- ar_val, ar_suffix); /* rawdata average */
+ HDfprintf(stream, " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n", re_dub,
+ suffixes[suffix_i], /* bin ceiling */
+ m->count, /* metadata reads */
+ r->count, /* rawdata reads */
+ bm_val, bm_suffix, /* metadata bytes */
+ br_val, br_suffix, /* rawdata bytes */
+ am_val, am_suffix, /* metadata average */
+ ar_val, ar_suffix); /* rawdata average */
HDfflush(stream);
}
@@ -1088,7 +1071,6 @@ done:
} /* ros3_fprint_stats */
#endif /* ROS3_STATS */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_close()
@@ -1124,12 +1106,12 @@ H5FD__ros3_close(H5FD_t H5_ATTR_UNUSED *_file)
/* Close the underlying request handle
*/
- if(FAIL == H5FD_s3comms_s3r_close(file->s3r_handle))
+ if (FAIL == H5FD_s3comms_s3r_close(file->s3r_handle))
HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to close S3 request handle")
#if ROS3_STATS
/* TODO: mechanism to re-target stats printout */
- if(ros3_fprint_stats(stdout, file) == FAIL)
+ if (ros3_fprint_stats(stdout, file) == FAIL)
HGOTO_ERROR(H5E_INTERNAL, H5E_ERROR, FAIL, "problem while writing file statistics")
#endif /* ROS3_STATS */
@@ -1142,7 +1124,6 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ros3_close() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_cmp()
@@ -1176,8 +1157,8 @@ done:
static int
H5FD__ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
{
- const H5FD_ros3_t *f1 = (const H5FD_ros3_t *)_f1;
- const H5FD_ros3_t *f2 = (const H5FD_ros3_t *)_f2;
+ const H5FD_ros3_t * f1 = (const H5FD_ros3_t *)_f1;
+ const H5FD_ros3_t * f2 = (const H5FD_ros3_t *)_f2;
const parsed_url_t *purl1 = NULL;
const parsed_url_t *purl2 = NULL;
int ret_value = 0;
@@ -1201,78 +1182,77 @@ H5FD__ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
HDassert(purl2->host != NULL);
/* URL: SCHEME */
- if(HDstrcmp(purl1->scheme, purl2->scheme))
+ if (HDstrcmp(purl1->scheme, purl2->scheme))
HGOTO_DONE(-1)
/* URL: HOST */
- if(HDstrcmp(purl1->host, purl2->host))
+ if (HDstrcmp(purl1->host, purl2->host))
HGOTO_DONE(-1)
/* URL: PORT */
- if(purl1->port && purl2->port) {
- if(HDstrcmp(purl1->port, purl2->port))
+ if (purl1->port && purl2->port) {
+ if (HDstrcmp(purl1->port, purl2->port))
HGOTO_DONE(-1)
}
- else if(purl1->port)
+ else if (purl1->port)
HGOTO_DONE(-1)
- else if(purl2->port)
+ else if (purl2->port)
HGOTO_DONE(-1)
/* URL: PATH */
- if(purl1->path && purl2->path) {
- if(HDstrcmp(purl1->path, purl2->path))
+ if (purl1->path && purl2->path) {
+ if (HDstrcmp(purl1->path, purl2->path))
HGOTO_DONE(-1)
}
- else if(purl1->path && !purl2->path)
+ else if (purl1->path && !purl2->path)
HGOTO_DONE(-1)
- else if(purl2->path && !purl1->path)
+ else if (purl2->path && !purl1->path)
HGOTO_DONE(-1)
/* URL: QUERY */
- if(purl1->query && purl2->query) {
- if(HDstrcmp(purl1->query, purl2->query))
+ if (purl1->query && purl2->query) {
+ if (HDstrcmp(purl1->query, purl2->query))
HGOTO_DONE(-1)
}
- else if(purl1->query && !purl2->query)
+ else if (purl1->query && !purl2->query)
HGOTO_DONE(-1)
- else if(purl2->query && !purl1->query)
+ else if (purl2->query && !purl1->query)
HGOTO_DONE(-1)
/* FAPL: AWS_REGION */
- if(f1->fa.aws_region[0] != '\0' && f2->fa.aws_region[0] != '\0') {
- if(HDstrcmp(f1->fa.aws_region, f2->fa.aws_region))
+ if (f1->fa.aws_region[0] != '\0' && f2->fa.aws_region[0] != '\0') {
+ if (HDstrcmp(f1->fa.aws_region, f2->fa.aws_region))
HGOTO_DONE(-1)
}
- else if(f1->fa.aws_region[0] != '\0')
+ else if (f1->fa.aws_region[0] != '\0')
HGOTO_DONE(-1)
- else if(f2->fa.aws_region[0] != '\0')
+ else if (f2->fa.aws_region[0] != '\0')
HGOTO_DONE(-1)
/* FAPL: SECRET_ID */
- if(f1->fa.secret_id[0] != '\0' && f2->fa.secret_id[0] != '\0') {
- if(HDstrcmp(f1->fa.secret_id, f2->fa.secret_id))
+ if (f1->fa.secret_id[0] != '\0' && f2->fa.secret_id[0] != '\0') {
+ if (HDstrcmp(f1->fa.secret_id, f2->fa.secret_id))
HGOTO_DONE(-1)
}
- else if(f1->fa.secret_id[0] != '\0')
+ else if (f1->fa.secret_id[0] != '\0')
HGOTO_DONE(-1)
- else if(f2->fa.secret_id[0] != '\0')
+ else if (f2->fa.secret_id[0] != '\0')
HGOTO_DONE(-1)
/* FAPL: SECRET_KEY */
- if(f1->fa.secret_key[0] != '\0' && f2->fa.secret_key[0] != '\0') {
- if(HDstrcmp(f1->fa.secret_key, f2->fa.secret_key))
+ if (f1->fa.secret_key[0] != '\0' && f2->fa.secret_key[0] != '\0') {
+ if (HDstrcmp(f1->fa.secret_key, f2->fa.secret_key))
HGOTO_DONE(-1)
}
- else if(f1->fa.secret_key[0] != '\0')
+ else if (f1->fa.secret_key[0] != '\0')
HGOTO_DONE(-1)
- else if(f2->fa.secret_key[0] != '\0')
+ else if (f2->fa.secret_key[0] != '\0')
HGOTO_DONE(-1)
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD__ros3_cmp() */
-
/*-------------------------------------------------------------------------
* Function: H5FD__ros3_query
*
@@ -1302,7 +1282,7 @@ H5FD__ros3_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags)
#endif
/* Set the VFL feature flags that this driver supports */
- if(flags) {
+ if (flags) {
*flags = 0;
/* OK to perform data sieving for faster raw data reads & writes */
*flags |= H5FD_FEAT_DATA_SIEVE;
@@ -1311,7 +1291,6 @@ H5FD__ros3_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FD__ros3_query() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_get_eoa()
@@ -1345,7 +1324,6 @@ H5FD__ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
FUNC_LEAVE_NOAPI(file->eoa)
} /* end H5FD__ros3_get_eoa() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_set_eoa()
@@ -1379,7 +1357,6 @@ H5FD__ros3_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FD__ros3_set_eoa() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_get_eof()
@@ -1412,7 +1389,6 @@ H5FD__ros3_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
FUNC_LEAVE_NOAPI(H5FD_s3comms_s3r_get_filesize(file->s3r_handle))
} /* end H5FD__ros3_get_eof() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_get_handle()
@@ -1431,8 +1407,7 @@ H5FD__ros3_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD__ros3_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl,
- void **file_handle)
+H5FD__ros3_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
{
H5FD_ros3_t *file = (H5FD_ros3_t *)_file;
herr_t ret_value = SUCCEED;
@@ -1443,7 +1418,7 @@ H5FD__ros3_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl,
HDfprintf(stdout, "H5FD__ros3_get_handle() called.\n");
#endif
- if(!file_handle)
+ if (!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
*file_handle = file->s3r_handle;
@@ -1452,7 +1427,6 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ros3_get_handle() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_read()
@@ -1476,9 +1450,8 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
- hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, size_t size,
- void *buf)
+H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
+ size_t size, void *buf)
{
H5FD_ros3_t *file = (H5FD_ros3_t *)_file;
size_t filesize = 0;
@@ -1489,7 +1462,6 @@ H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
unsigned bin_i = 0;
#endif /* ROS3_STATS */
-
FUNC_ENTER_STATIC
#if ROS3_DEBUG
@@ -1502,31 +1474,29 @@ H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
filesize = H5FD_s3comms_s3r_get_filesize(file->s3r_handle);
- if((addr > filesize) || ((addr + size) > filesize))
+ if ((addr > filesize) || ((addr + size) > filesize))
HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "range exceeds file address")
- if(H5FD_s3comms_s3r_read(file->s3r_handle, addr, size, buf) == FAIL)
+ if (H5FD_s3comms_s3r_read(file->s3r_handle, addr, size, buf) == FAIL)
HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "unable to execute read")
#if ROS3_STATS
/* Find which "bin" this read fits in. Can be "overflow" bin. */
- for(bin_i = 0; bin_i < ROS3_STATS_BIN_COUNT; bin_i++)
- if((unsigned long long)size < ros3_stats_boundaries[bin_i])
+ for (bin_i = 0; bin_i < ROS3_STATS_BIN_COUNT; bin_i++)
+ if ((unsigned long long)size < ros3_stats_boundaries[bin_i])
break;
- bin = (type == H5FD_MEM_DRAW)
- ? &file->raw[bin_i]
- : &file->meta[bin_i];
+ bin = (type == H5FD_MEM_DRAW) ? &file->raw[bin_i] : &file->meta[bin_i];
/* Store collected stats in appropriate bin */
- if(bin->count == 0) {
+ if (bin->count == 0) {
bin->min = size;
bin->max = size;
}
else {
- if(size < bin->min)
+ if (size < bin->min)
bin->min = size;
- if(size > bin->max)
+ if (size > bin->max)
bin->max = size;
}
bin->count++;
@@ -1538,7 +1508,6 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ros3_read() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_write()
@@ -1558,9 +1527,8 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD__ros3_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type,
- hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr,
- size_t H5_ATTR_UNUSED size, const void H5_ATTR_UNUSED *buf)
+H5FD__ros3_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
+ haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED size, const void H5_ATTR_UNUSED *buf)
{
herr_t ret_value = FAIL;
@@ -1576,7 +1544,6 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD__ros3_write() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_truncate()
@@ -1599,7 +1566,7 @@ done:
*/
static herr_t
H5FD__ros3_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id,
- hbool_t H5_ATTR_UNUSED closing)
+ hbool_t H5_ATTR_UNUSED closing)
{
herr_t ret_value = SUCCEED;
@@ -1615,7 +1582,6 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ros3_truncate() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_lock()
@@ -1638,15 +1604,13 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD__ros3_lock(H5FD_t H5_ATTR_UNUSED *_file,
- hbool_t H5_ATTR_UNUSED rw)
+H5FD__ros3_lock(H5FD_t H5_ATTR_UNUSED *_file, hbool_t H5_ATTR_UNUSED rw)
{
FUNC_ENTER_STATIC_NOERR
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__ros3_lock() */
-
/*-------------------------------------------------------------------------
*
* Function: H5FD__ros3_unlock()
@@ -1674,4 +1638,3 @@ H5FD__ros3_unlock(H5FD_t H5_ATTR_UNUSED *_file)
} /* end H5FD__ros3_unlock() */
#endif /* H5_HAVE_ROS3_VFD */
-