diff options
author | Kota Tsuyuzaki <bloodeagle40234@gmail.com> | 2015-03-05 13:59:06 +0900 |
---|---|---|
committer | Kota Tsuyuzaki <bloodeagle40234@gmail.com> | 2015-03-05 14:02:01 +0900 |
commit | a63cae119076319e39b53a488a8e3b0735feebc2 (patch) | |
tree | 3bbdb7f05373383240d8534098352b68581dcee8 | |
parent | dd67555f8425ff5fa3cb9b807224ab5199614394 (diff) | |
download | liberasurecode-a63cae119076319e39b53a488a8e3b0735feebc2.tar.gz |
Rename metadata_adder on backend_common
This patch renames the "metadata_adder" variable to "backend_metadata_size"
-rw-r--r-- | include/erasurecode/erasurecode_backend.h | 4 | ||||
-rw-r--r-- | src/backends/isa-l/isa_l_rs_vand.c | 2 | ||||
-rw-r--r-- | src/backends/jerasure/jerasure_rs_cauchy.c | 2 | ||||
-rw-r--r-- | src/backends/jerasure/jerasure_rs_vand.c | 2 | ||||
-rw-r--r-- | src/backends/null/null.c | 2 | ||||
-rw-r--r-- | src/backends/shss/shss.c | 2 | ||||
-rw-r--r-- | src/backends/xor/flat_xor_hd.c | 2 | ||||
-rw-r--r-- | src/erasurecode.c | 2 | ||||
-rw-r--r-- | src/erasurecode_postprocessing.c | 2 | ||||
-rw-r--r-- | src/erasurecode_preprocessing.c | 2 | ||||
-rw-r--r-- | test/liberasurecode_test.c | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/include/erasurecode/erasurecode_backend.h b/include/erasurecode/erasurecode_backend.h index 921a9a1..8b88c1b 100644 --- a/include/erasurecode/erasurecode_backend.h +++ b/include/erasurecode/erasurecode_backend.h @@ -109,8 +109,8 @@ struct ec_backend_common { char soversion[MAX_LEN]; /* EC backend shared library version */ struct ec_backend_op_stubs *ops; /* EC backend stubs */ - size_t metadata_adder; /* EC backend custom metadata adder - - * metadata_adder bytes are added to + size_t backend_metadata_size; /* EC backend custom metadata size - + * backend_metadata_size bytes are added to * the fragment size when allocating * data/parity fragment buffers */ uint32_t ec_backend_version; /* The revision number of this back diff --git a/src/backends/isa-l/isa_l_rs_vand.c b/src/backends/isa-l/isa_l_rs_vand.c index 98a9226..541d308 100644 --- a/src/backends/isa-l/isa_l_rs_vand.c +++ b/src/backends/isa-l/isa_l_rs_vand.c @@ -608,7 +608,7 @@ struct ec_backend_common backend_isa_l_rs_vand = { .soname = ISA_L_RS_VAND_SO_NAME, .soversion = ISA_L_RS_VAND_LIB_VER_STR, .ops = &isa_l_rs_vand_op_stubs, - .metadata_adder = 0, + .backend_metadata_size = 0, .ec_backend_version = _VERSION(ISA_L_RS_VAND_LIB_MAJOR, ISA_L_RS_VAND_LIB_MINOR, ISA_L_RS_VAND_LIB_REV), diff --git a/src/backends/jerasure/jerasure_rs_cauchy.c b/src/backends/jerasure/jerasure_rs_cauchy.c index ee924d2..4728a14 100644 --- a/src/backends/jerasure/jerasure_rs_cauchy.c +++ b/src/backends/jerasure/jerasure_rs_cauchy.c @@ -427,7 +427,7 @@ struct ec_backend_common backend_jerasure_rs_cauchy = { .soname = JERASURE_RS_CAUCHY_SO_NAME, .soversion = JERASURE_RS_CAUCHY_LIB_VER_STR, .ops = &jerasure_rs_cauchy_op_stubs, - .metadata_adder = 0, + .backend_metadata_size = 0, .ec_backend_version = _VERSION(JERASURE_RS_CAUCHY_LIB_MAJOR, JERASURE_RS_CAUCHY_LIB_MINOR, JERASURE_RS_CAUCHY_LIB_REV), diff --git a/src/backends/jerasure/jerasure_rs_vand.c b/src/backends/jerasure/jerasure_rs_vand.c index fee7356..803bd95 100644 --- a/src/backends/jerasure/jerasure_rs_vand.c +++ b/src/backends/jerasure/jerasure_rs_vand.c @@ -342,7 +342,7 @@ struct ec_backend_common backend_jerasure_rs_vand = { .soname = JERASURE_RS_VAND_SO_NAME, .soversion = JERASURE_RS_VAND_LIB_VER_STR, .ops = &jerasure_rs_vand_op_stubs, - .metadata_adder = 0, + .backend_metadata_size = 0, .ec_backend_version = _VERSION(JERASURE_RS_VAND_LIB_MAJOR, JERASURE_RS_VAND_LIB_MINOR, JERASURE_RS_VAND_LIB_REV), diff --git a/src/backends/null/null.c b/src/backends/null/null.c index 294a990..767d9d0 100644 --- a/src/backends/null/null.c +++ b/src/backends/null/null.c @@ -232,7 +232,7 @@ struct ec_backend_common backend_null = { .soname = NULL_SO_NAME, .soversion = NULL_LIB_VER_STR, .ops = &null_op_stubs, - .metadata_adder = 0, + .backend_metadata_size = 0, .ec_backend_version = _VERSION(NULL_LIB_MAJOR, NULL_LIB_MINOR, NULL_LIB_REV), }; diff --git a/src/backends/shss/shss.c b/src/backends/shss/shss.c index 3553456..601fc01 100644 --- a/src/backends/shss/shss.c +++ b/src/backends/shss/shss.c @@ -302,5 +302,5 @@ struct ec_backend_common backend_shss = { .soname = SHSS_SO_NAME, .soversion = SHSS_LIB_VER_STR, .ops = &shss_op_stubs, - .metadata_adder = METADATA, + .backend_metadata_size = METADATA, }; diff --git a/src/backends/xor/flat_xor_hd.c b/src/backends/xor/flat_xor_hd.c index 67a54ae..2af60af 100644 --- a/src/backends/xor/flat_xor_hd.c +++ b/src/backends/xor/flat_xor_hd.c @@ -186,7 +186,7 @@ struct ec_backend_common backend_flat_xor_hd = { .soname = FLAT_XOR_SO_NAME, .soversion = FLAT_XOR_LIB_VER_STR, .ops = &flat_xor_hd_op_stubs, - .metadata_adder = 0, + .backend_metadata_size = 0, .ec_backend_version = _VERSION(FLAT_XOR_LIB_MAJOR, FLAT_XOR_LIB_MINOR, FLAT_XOR_LIB_REV), diff --git a/src/erasurecode.c b/src/erasurecode.c index 66a7e2f..0404e4d 100644 --- a/src/erasurecode.c +++ b/src/erasurecode.c @@ -1123,7 +1123,7 @@ int liberasurecode_get_fragment_size(int desc, int data_len) ec_backend_t instance = liberasurecode_backend_instance_get_by_desc(desc); // TODO: Create a common function to calculate fragment size also for preprocessing int aligned_data_len = get_aligned_data_size(instance, data_len); - int size = (aligned_data_len / instance->args.uargs.k) + instance->common.metadata_adder; + int size = (aligned_data_len / instance->args.uargs.k) + instance->common.backend_metadata_size; return size; } diff --git a/src/erasurecode_postprocessing.c b/src/erasurecode_postprocessing.c index b1627f7..af418fa 100644 --- a/src/erasurecode_postprocessing.c +++ b/src/erasurecode_postprocessing.c @@ -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_backend_metadata_size(fragment, be->common.metadata_adder); + set_fragment_backend_metadata_size(fragment, be->common.backend_metadata_size); if (add_chksum) { set_checksum(ct, fragment, blocksize); diff --git a/src/erasurecode_preprocessing.c b/src/erasurecode_preprocessing.c index 9666b9d..e8bd510 100644 --- a/src/erasurecode_preprocessing.c +++ b/src/erasurecode_preprocessing.c @@ -46,7 +46,7 @@ int prepare_fragments_for_encode(ec_backend_t instance, data_len = orig_data_size; aligned_data_len = get_aligned_data_size(instance, orig_data_size); *blocksize = payload_size = (aligned_data_len / k); - buffer_size = payload_size + instance->common.metadata_adder; + buffer_size = payload_size + instance->common.backend_metadata_size; for (i = 0; i < k; i++) { int copy_size = data_len > payload_size ? payload_size : data_len; diff --git a/test/liberasurecode_test.c b/test/liberasurecode_test.c index 7fb9557..fe3c006 100644 --- a/test/liberasurecode_test.c +++ b/test/liberasurecode_test.c @@ -617,7 +617,7 @@ static void encode_decode_test_impl(const ec_backend_id_t be_id, assert(header != NULL); fragment_metadata_t metadata = header->meta; assert(metadata.idx == i); - assert(metadata.size == encoded_fragment_len - frag_header_size - be->common.metadata_adder); + assert(metadata.size == encoded_fragment_len - frag_header_size - be->common.backend_metadata_size); assert(metadata.orig_data_size == orig_data_size); char *data_ptr = frag + frag_header_size; int cmp_size = remaining >= metadata.size ? metadata.size : remaining; |