diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2012-06-06 21:12:34 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2012-06-06 21:12:34 (GMT) |
| commit | 596d5b2662e0cd9003efdfce6dd0fa160395ba67 (patch) | |
| tree | 89e20ff22e826fa7b2a486c72b7a85c61deb7f69 /src/H5FDmulti.c | |
| parent | 71ca559f81df96e2e792e4bb831f4f07db860cf9 (diff) | |
| download | hdf5-596d5b2662e0cd9003efdfce6dd0fa160395ba67.zip hdf5-596d5b2662e0cd9003efdfce6dd0fa160395ba67.tar.gz hdf5-596d5b2662e0cd9003efdfce6dd0fa160395ba67.tar.bz2 | |
[svn-r22438] (1) fix for making MEM_GHEAP as MEM_DRAW
(2) fix to extend into the aggregator based on threshold
(3) fix for the "flavor" logging problem
(4) fix for test failures due to the above fixes
(5) bug fix for h5stat when h5stat against a non-existing file
--Ths line, and th se below, will be ignored--
M test/mf.c
M src/H5MFaggr.c
M src/H5FDpublic.h
M src/H5MF.c
M src/H5FDmulti.c
M src/H5FDlog.c
M src/H5Faccum.c
M tools/h5copy/testfiles/h5copytst.out.ls
M tools/h5copy/testfiles/h5copy_ref.out.ls
M tools/h5stat/testh5stat.sh.in
M tools/h5stat/h5stat.c
Diffstat (limited to 'src/H5FDmulti.c')
| -rw-r--r-- | src/H5FDmulti.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 772384f..cdb874a 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -308,7 +308,8 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, /* Initialize */ ALL_MEMBERS(mt) { - memb_map[mt] = (H5FD_MEM_DRAW==mt?mt:H5FD_MEM_SUPER); + /* Treat global heap as raw data, not metadata */ + memb_map[mt] = ((mt == H5FD_MEM_DRAW || mt == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : H5FD_MEM_SUPER); memb_fapl[mt] = -1; memb_name[mt] = NULL; memb_addr[mt] = HADDR_UNDEF; |