diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-07-21 05:57:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-07-21 05:57:49 (GMT) |
| commit | 8aa6ca14bb84f0c7d3ebbda7851c1d727355c5ad (patch) | |
| tree | 6751a92d13f3da9705970691667cec2fffef9a9c /src/H5FDlog.c | |
| parent | 63f00c56866c2a80f89da65db1d7f3368210ec83 (diff) | |
| download | hdf5-8aa6ca14bb84f0c7d3ebbda7851c1d727355c5ad.zip hdf5-8aa6ca14bb84f0c7d3ebbda7851c1d727355c5ad.tar.gz hdf5-8aa6ca14bb84f0c7d3ebbda7851c1d727355c5ad.tar.bz2 | |
[svn-r13992] Description:
Add some extra logging information to read & write reports.
Tested on:
FreeBSD/32 6.2 (duty) w/check-vfd
Diffstat (limited to 'src/H5FDlog.c')
| -rw-r--r-- | src/H5FDlog.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 5130c65..3109e09 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -861,7 +861,7 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, hsize_t siz } /* end if */ if(file->fa.flags&H5FD_LOG_ALLOC) - HDfprintf(file->logfp,"%10a-%10a (%10Hu bytes) Allocated, flavor=%s\n",addr,addr+size-1,size,flavors[type]); + HDfprintf(file->logfp,"%10a-%10a (%10Hu bytes) (%s) Allocated\n",addr,addr+size-1,size,flavors[type]); } /* end if */ /* Set return value */ @@ -1035,7 +1035,7 @@ done: */ /* ARGSUSED */ static herr_t -H5FD_log_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr, +H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t addr, size_t size, void *buf/*out*/) { H5FD_log_t *file = (H5FD_log_t*)_file; @@ -1075,11 +1075,8 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr /* Log information about the read */ if(file->fa.flags&H5FD_LOG_LOC_READ) { - /* Output the flavor information, if we have it */ - if(file->fa.flags&H5FD_LOG_FLAVOR) - HDfprintf(file->logfp,"%10a-%10a (%10Zu bytes) Read, flavor=%s\n",addr,addr+size-1,size,flavors[file->flavor[addr]]); - else - HDfprintf(file->logfp,"%10a-%10a (%10Zu bytes) Read\n",addr,addr+size-1,size); + HDfprintf(file->logfp,"%10a-%10a (%10Zu bytes) (%s) Read\n",addr,addr+size-1,size,flavors[type]); +/* XXX: Verify the flavor information, if we have it? */ } /* end if */ } /* end if */ @@ -1264,11 +1261,7 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add /* Log information about the write */ if(file->fa.flags&H5FD_LOG_LOC_WRITE) { - /* Output the flavor information, if desired */ - if(file->fa.flags&H5FD_LOG_FLAVOR) - HDfprintf(file->logfp,"%10a-%10a (%10Zu bytes) (%s) Written",orig_addr,orig_addr+orig_size-1,orig_size,flavors[file->flavor[orig_addr]]); - else - HDfprintf(file->logfp,"%10a-%10a (%10Zu bytes) Written",orig_addr,orig_addr+orig_size-1,orig_size); + HDfprintf(file->logfp,"%10a-%10a (%10Zu bytes) (%s) Written",orig_addr,orig_addr+orig_size-1,orig_size,flavors[type]); /* Check if this is the first write into a "default" section, grabbed by the metadata agregation algorithm */ if(file->fa.flags&H5FD_LOG_FLAVOR) { |