[svn-r13500] Description:

	Roll changes to SOHM v2 B-tree records into format, to get the format
for them stable while I'm working on debugging the actual support for the
"unique, but sharable" feature.

Tested on:
	FreeBSD/32 6.2 (duty)

2 files changed, 4 insertions, 1 deletions

diff --git a/src/H5SM.c b/src/H5SM.c
index f923664..dc2ea5f 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -1592,6 +1592,7 @@ H5SM_message_encode(const H5F_t UNUSED *f, uint8_t *raw, const void *_nrecord)
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_message_encode)
 
     /* Encode the SOHM's fields */
+    *raw++ = 0;                 /* The "location" of the message (will be replaced in following checkin) */
     UINT32ENCODE(raw, message->hash);
     UINT32ENCODE(raw, message->ref_count);
     UINT64ENCODE(raw, message->fheap_id);
@@ -1621,6 +1622,7 @@ H5SM_message_decode(const H5F_t UNUSED *f, const uint8_t *raw, void *_nrecord)
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_message_decode)
 
     /* Encode the SOHM's fields */
+    raw++;                      /* skip unused "location" field right now */
     UINT32DECODE(raw, message->hash);
     UINT32DECODE(raw, message->ref_count);
     UINT64DECODE(raw, message->fheap_id);
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h
index aab7eb3..13935ab 100755
--- a/src/H5SMpkg.h
+++ b/src/H5SMpkg.h
@@ -45,7 +45,8 @@
 #define H5SM_TABLE_SIZEOF_MAGIC 4
 #define H5SM_SIZEOF_CHECKSUM 4
 
-#define H5SM_SOHM_ENTRY_SIZE(f) (4  /* Hash value */                         \
+#define H5SM_SOHM_ENTRY_SIZE(f) (1  /* "location" (unused right now) */      \
+         + 4                        /* Hash value */                         \
          + 4                        /* reference count*/                     \
          + sizeof(H5O_fheap_id_t))  /* size of heap ID on disk */