diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-10-11 06:19:42 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-10-11 22:40:40 (GMT) |
| commit | 294e4faab724c26985867fe8ede684967da8a698 (patch) | |
| tree | e7456e1777fd52f0280f0cea36795b03e4ec23d3 /src/H5VLnative_object.c | |
| parent | 1cac341502d8acb296f41db38d31b7eb8021ffdb (diff) | |
| download | hdf5-294e4faab724c26985867fe8ede684967da8a698.zip hdf5-294e4faab724c26985867fe8ede684967da8a698.tar.gz hdf5-294e4faab724c26985867fe8ede684967da8a698.tar.bz2 | |
Fix encode and decode of tokens in H5VLnative
Fix encode and decode of deprecated object reference addresses
Make H5Rdeprec.c use tokens instead of haddr_t
Fix H5Oopen_by_addr() to serialize addr to token
Diffstat (limited to 'src/H5VLnative_object.c')
| -rw-r--r-- | src/H5VLnative_object.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/H5VLnative_object.c b/src/H5VLnative_object.c index 64d3978..675d8cf 100644 --- a/src/H5VLnative_object.c +++ b/src/H5VLnative_object.c @@ -71,8 +71,14 @@ H5VL__native_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_typ case H5VL_OBJECT_BY_TOKEN: { + const uint8_t *p = (const uint8_t *)loc_params->loc_data.loc_by_token.token; + haddr_t addr; + + /* Decode token */ + H5F_addr_decode(loc.oloc->file, &p, &addr); + /* Open the object */ - if(NULL == (ret_value = H5O_open_by_addr(&loc, *(haddr_t *)loc_params->loc_data.loc_by_token.token, opened_type))) + if(NULL == (ret_value = H5O_open_by_addr(&loc, addr, opened_type))) HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object by address") break; } @@ -158,11 +164,13 @@ H5VL__native_object_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_obj } /* end if */ else if(loc_params->type == H5VL_OBJECT_BY_TOKEN) { H5O_loc_t obj_oloc; /* Object location */ + const uint8_t *p = (const uint8_t *)loc_params->loc_data.loc_by_token.token; /* Initialize the object location */ H5O_loc_reset(&obj_oloc); obj_oloc.file = loc.oloc->file; - obj_oloc.addr = *(haddr_t *)loc_params->loc_data.loc_by_token.token; + /* Decode token */ + H5F_addr_decode(obj_oloc.file, &p, &obj_oloc.addr); /* Retrieve object's name */ if((*ret = H5G_get_name_by_addr(loc.oloc->file, &obj_oloc, name, size)) < 0) @@ -181,11 +189,13 @@ H5VL__native_object_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_obj if(loc_params->type == H5VL_OBJECT_BY_TOKEN) { H5O_loc_t obj_oloc; /* Object location */ unsigned rc; /* Reference count of object */ + const uint8_t *p = (const uint8_t *)loc_params->loc_data.loc_by_token.token; /* Initialize the object location */ H5O_loc_reset(&obj_oloc); obj_oloc.file = loc.oloc->file; - obj_oloc.addr = *(haddr_t *)loc_params->loc_data.loc_by_token.token; + /* Decode token */ + H5F_addr_decode(obj_oloc.file, &p, &obj_oloc.addr); /* Get the # of links for object, and its type */ /* (To check to make certain that this object hasn't been deleted) */ @@ -265,6 +275,7 @@ H5VL__native_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5V H5G_loc_t obj_loc; /* Group hier. location of object */ H5G_name_t obj_path; /* Object group hier. path */ H5O_loc_t obj_oloc; /* Object object location */ + uint8_t *p = (uint8_t *)token; /* Pointer to token */ /* Set up opened group location to fill in */ obj_loc.oloc = &obj_oloc; @@ -274,7 +285,9 @@ H5VL__native_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5V /* Find the object */ if(H5G_loc_find(&loc, loc_params->loc_data.loc_by_name.name, &obj_loc) < 0) HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "object not found") - *(haddr_t *)token = obj_loc.oloc->addr; + + /* Encode token */ + H5F_addr_encode(obj_oloc.file, &p, obj_loc.oloc->addr); /* Release the object location */ if(H5G_loc_free(&obj_loc) < 0) |