openstack
/
liberasurecode
Code Issues Proposed changes

Rename frag_adder_size 

This patch renames following variables and functions:

- frag_adder_size -> frag_backend_metadata_size
- set_fragment_adder_size() -> set_fragment_backend_metadata_size()
- get_fragment_adder_size() -> get_fragment_backend_metadata_size()
This commit is contained in:
Kota Tsuyuzaki 2015-03-05 13:43:19 +09:00
parent 9722168b58
commit dd67555f84
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -278,7 +278,7 @@ fragment_metadata
{
uint32_t idx; /* 4 */
uint32_t size; /* 4 (raw data bytes size of each fragment used for encode/fragment_to_string) */
uint32_t frag_adder_size; /* 4 (extra metadata_adder bytes size of backend specification) */
uint32_t frag_backend_metadata_size; /* 4 (extra metadata bytes size of backend specification) */
uint64_t orig_data_size; /* 8 */
uint8_t chksum_type; /* 1 */
uint32_t chksum[LIBERASURECODE_MAX_CHECKSUM_LEN]; /* 16 */
@ -349,7 +349,8 @@ int liberasurecode_get_minimum_encode_size(int desc);
* from liberasurecode_instance_create()
* @param data_len - original data length in bytes
*
* @return fragment size - sizeof(fragment_header) + size + frag_adder_size
* @return fragment size - sizeof(fragment_header) + size
* + frag_backend_metadata_size
*/
int liberasurecode_get_fragment_size(int desc, int data_len);

5
include/erasurecode/erasurecode.h
View File

@ -247,7 +247,7 @@ fragment_metadata
{
uint32_t idx; /* 4 */
uint32_t size; /* 4 */
uint32_t frag_adder_size; /* 4 */
uint32_t frag_backend_metadata_size; /* 4 */
uint64_t orig_data_size; /* 8 */
uint8_t chksum_type; /* 1 */
uint32_t chksum[LIBERASURECODE_MAX_CHECKSUM_LEN]; /* 32 */
@ -336,7 +336,8 @@ int liberasurecode_get_minimum_encode_size(int desc);
* from liberasurecode_instance_create()
* @param data_len - original data length in bytes
*
* @return fragment size - sizeof(fragment_header) + size + frag_adder_size
* @return fragment size - sizeof(fragment_header) + size
* + frag_backend_metadata_size
*/
int liberasurecode_get_fragment_size(int desc, int data_len);

4
include/erasurecode/erasurecode_helpers.h
View File

@ -135,8 +135,8 @@ int set_fragment_idx(char *buf, int idx);
int get_fragment_idx(char *buf);
int set_fragment_payload_size(char *buf, int size);
int get_fragment_payload_size(char *buf);
int set_fragment_adder_size(char *buf, int size);
int get_fragment_adder_size(char *buf);
int set_fragment_backend_metadata_size(char *buf, int size);
int get_fragment_backend_metadata_size(char *buf);
int get_fragment_buffer_size(char *buf);
int set_orig_data_size(char *buf, int orig_data_size);
int get_orig_data_size(char *buf);

14
src/erasurecode_helpers.c
View File

@ -324,32 +324,32 @@ int get_fragment_payload_size(char *buf)
return header->meta.size;
}
int set_fragment_adder_size(char *buf, int size)
int set_fragment_backend_metadata_size(char *buf, int size)
{
fragment_header_t *header = (fragment_header_t *) buf;
assert(NULL != header);
if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
log_error("Invalid fragment header (set adder size)!");
log_error("Invalid fragment header (set fragment backend metadata size)!");
return -1;
}
header->meta.frag_adder_size = size;
header->meta.frag_backend_metadata_size = size;
return 0;
}
int get_fragment_adder_size(char *buf)
int get_fragment_backend_metadata_size(char *buf)
{
fragment_header_t *header = (fragment_header_t *) buf;
assert(NULL != header);
if (header->magic != LIBERASURECODE_FRAG_HEADER_MAGIC) {
log_error("Invalid fragment header (get adder size)!");
log_error("Invalid fragment header (get fragment backend metadata size)!");
return -1;
}
return header->meta.frag_adder_size;
return header->meta.frag_backend_metadata_size;
}
int get_fragment_buffer_size(char *buf)
@ -362,7 +362,7 @@ int get_fragment_buffer_size(char *buf)
return -1;
}
return header->meta.size + header->meta.frag_adder_size;
return header->meta.size + header->meta.frag_backend_metadata_size;
}
int set_orig_data_size(char *buf, int orig_data_size)

2
src/erasurecode_postprocessing.c
View File

@ -41,7 +41,7 @@ void add_fragment_metadata(ec_backend_t be, char *fragment,
set_fragment_payload_size(fragment, blocksize);
set_backend_id(fragment, be->common.id);
set_backend_version(fragment, be->common.ec_backend_version);
set_fragment_adder_size(fragment, be->common.metadata_adder);
set_fragment_backend_metadata_size(fragment, be->common.metadata_adder);
if (add_chksum) {
set_checksum(ct, fragment, blocksize);