[svn-r4665] Purpose:

    Code cleanup
Description:
    Changed the logging file driver to use bitmasked flags for features to
    enable, instead of using a verbosity level.
Platforms tested:
    Solaris 2.6 (baldric)

1 files changed, 29 insertions, 1 deletions

diff --git a/src/H5FDlog.h b/src/H5FDlog.h
index 65d1222..9319999 100644
--- a/src/H5FDlog.h
+++ b/src/H5FDlog.h
@@ -14,12 +14,40 @@
 
 #define H5FD_LOG	(H5FD_log_init())
 
+/* Flags for H5Pset_fapl_log() */
+/* Flags for tracking where reads/writes/seeks occur */
+#define H5FD_LOG_LOC_READ   0x0001
+#define H5FD_LOG_LOC_WRITE  0x0002
+#define H5FD_LOG_LOC_SEEK   0x0004
+#define H5FD_LOG_LOC_IO     (H5FD_LOG_LOC_READ|H5FD_LOG_LOC_WRITE|H5FD_LOG_LOC_SEEK)
+/* Flags for tracking number of times each byte is read/written */
+#define H5FD_LOG_FILE_READ  0x0008
+#define H5FD_LOG_FILE_WRITE 0x0010
+#define H5FD_LOG_FILE_IO    (H5FD_LOG_FILE_READ|H5FD_LOG_FILE_WRITE)
+/* Flag for tracking "flavor" (type) of information stored at each byte */
+#define H5FD_LOG_FLAVOR     0x0020
+/* Flags for tracking total number of reads/writes/seeks */
+#define H5FD_LOG_NUM_READ   0x0040
+#define H5FD_LOG_NUM_WRITE  0x0080
+#define H5FD_LOG_NUM_SEEK   0x0100
+#define H5FD_LOG_NUM_IO     (H5FD_LOG_NUM_READ|H5FD_LOG_NUM_WRITE|H5FD_LOG_NUM_SEEK)
+/* Flags for tracking time spent in open/read/write/seek/close */
+#define H5FD_LOG_TIME_OPEN  0x0200      /* Not implemented yet */
+#define H5FD_LOG_TIME_READ  0x0400      /* Not implemented yet */
+#define H5FD_LOG_TIME_WRITE 0x0800      /* Partially implemented (need to track total time) */
+#define H5FD_LOG_TIME_SEEK  0x1000      /* Partially implemented (need to track total time & track time for seeks during reading) */
+#define H5FD_LOG_TIME_CLOSE 0x2000      /* Fully implemented */
+#define H5FD_LOG_TIME_IO    (H5FD_LOG_TIME_OPEN|H5FD_LOG_TIME_READ|H5FD_LOG_TIME_WRITE|H5FD_LOG_TIME_SEEK|H5FD_LOG_TIME_CLOSE)
+/* Flag for tracking allocation of space in file */
+#define H5FD_LOG_ALLOC      0x4000
+#define H5FD_LOG_ALL        (H5FD_LOG_ALLOC|H5FD_LOG_TIME_IO|H5FD_LOG_NUM_IO|H5FD_LOG_FLAVOR|H5FD_LOG_FILE_IO|H5FD_LOG_LOC_IO)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 __DLL__ hid_t H5FD_log_init(void);
-__DLL__ herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, int verbosity);
+__DLL__ herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, unsigned flags, size_t buf_size);
 
 #ifdef __cplusplus
 }