From 6c8a082596dec312ba47fe74a41e05d23729277d Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 22 Mar 2006 13:46:08 -0500 Subject: [svn-r12131] Purpose: Code update Description: Add new minor error, for heap metadata operations. Platforms tested: FreeBSD 4.11 (sleipnir) Linux 2.4 (chicago) Mac OSX (amazon) --- src/H5Edefin.h | 1 + src/H5Einit.h | 5 +++++ src/H5Epubgen.h | 2 ++ src/H5Eterm.h | 3 ++- src/H5err.txt | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/H5Edefin.h b/src/H5Edefin.h index 122f493..234fc30 100644 --- a/src/H5Edefin.h +++ b/src/H5Edefin.h @@ -149,6 +149,7 @@ hid_t H5E_CANTINS_g = FAIL; /* Unable to insert metadata into cache hid_t H5E_CANTRENAME_g = FAIL; /* Unable to rename metadata */ hid_t H5E_CANTPROTECT_g = FAIL; /* Unable to protect metadata */ hid_t H5E_CANTUNPROTECT_g = FAIL; /* Unable to unprotect metadata */ +hid_t H5E_CANTDIRTY_g = FAIL; /* Unable to mark metadata as dirty */ /* Parallel MPI errors */ hid_t H5E_MPI_g = FAIL; /* Some MPI function failed */ diff --git a/src/H5Einit.h b/src/H5Einit.h index 0fc0204..1b28419 100644 --- a/src/H5Einit.h +++ b/src/H5Einit.h @@ -551,6 +551,11 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unprotect metadata"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") if((H5E_CANTUNPROTECT_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +assert(H5E_CANTDIRTY_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to mark metadata as dirty"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_CANTDIRTY_g = H5I_register(H5I_ERROR_MSG, msg))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") /* Parallel MPI errors */ assert(H5E_MPI_g==(-1)); diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h index f8ee84c..4139589 100644 --- a/src/H5Epubgen.h +++ b/src/H5Epubgen.h @@ -243,6 +243,7 @@ H5_DLLVAR hid_t H5E_NOIDS_g; /* Out of IDs for group */ #define H5E_CANTRENAME (H5OPEN H5E_CANTRENAME_g) #define H5E_CANTPROTECT (H5OPEN H5E_CANTPROTECT_g) #define H5E_CANTUNPROTECT (H5OPEN H5E_CANTUNPROTECT_g) +#define H5E_CANTDIRTY (H5OPEN H5E_CANTDIRTY_g) H5_DLLVAR hid_t H5E_CANTFLUSH_g; /* Unable to flush data from cache */ H5_DLLVAR hid_t H5E_CANTSERIALIZE_g; /* Unable to serialize data from cache */ H5_DLLVAR hid_t H5E_CANTLOAD_g; /* Unable to load metadata into cache */ @@ -253,6 +254,7 @@ H5_DLLVAR hid_t H5E_CANTINS_g; /* Unable to insert metadata into cache */ H5_DLLVAR hid_t H5E_CANTRENAME_g; /* Unable to rename metadata */ H5_DLLVAR hid_t H5E_CANTPROTECT_g; /* Unable to protect metadata */ H5_DLLVAR hid_t H5E_CANTUNPROTECT_g; /* Unable to unprotect metadata */ +H5_DLLVAR hid_t H5E_CANTDIRTY_g; /* Unable to mark metadata as dirty */ /* Parallel MPI errors */ #define H5E_MPI (H5OPEN H5E_MPI_g) diff --git a/src/H5Eterm.h b/src/H5Eterm.h index d04db96..0a48b62 100644 --- a/src/H5Eterm.h +++ b/src/H5Eterm.h @@ -150,7 +150,8 @@ H5E_SYSTEM_g= H5E_CANTINS_g= H5E_CANTRENAME_g= H5E_CANTPROTECT_g= -H5E_CANTUNPROTECT_g= +H5E_CANTUNPROTECT_g= +H5E_CANTDIRTY_g= /* Parallel MPI errors */ H5E_MPI_g= diff --git a/src/H5err.txt b/src/H5err.txt index d55ad9e..58d6341 100644 --- a/src/H5err.txt +++ b/src/H5err.txt @@ -156,6 +156,7 @@ MINOR, CACHE, H5E_CANTINS, Unable to insert metadata into cache MINOR, CACHE, H5E_CANTRENAME, Unable to rename metadata MINOR, CACHE, H5E_CANTPROTECT, Unable to protect metadata MINOR, CACHE, H5E_CANTUNPROTECT, Unable to unprotect metadata +MINOR, CACHE, H5E_CANTDIRTY, Unable to mark metadata as dirty # B-tree related errors MINOR, BTREE, H5E_NOTFOUND, Object not found -- cgit v0.12