diff options
| -rw-r--r-- | include/erasurecode/erasurecode.h | 2 | ||||
| -rw-r--r-- | src/backends/rs_vand/liberasurecode_rs_vand.c | 28 | ||||
| -rw-r--r-- | test/liberasurecode_test.c | 34 |
3 files changed, 32 insertions, 32 deletions
diff --git a/include/erasurecode/erasurecode.h b/include/erasurecode/erasurecode.h index e40c164..cfceb7b 100644 --- a/include/erasurecode/erasurecode.h +++ b/include/erasurecode/erasurecode.h @@ -46,7 +46,7 @@ typedef enum { EC_BACKEND_FLAT_XOR_HD = 3, EC_BACKEND_ISA_L_RS_VAND = 4, EC_BACKEND_SHSS = 5, - EC_BACKEND_INTERNAL_RS_VAND = 6, + EC_BACKEND_LIBERASURECODE_RS_VAND = 6, EC_BACKENDS_MAX, } ec_backend_id_t; diff --git a/src/backends/rs_vand/liberasurecode_rs_vand.c b/src/backends/rs_vand/liberasurecode_rs_vand.c index 81dfb1c..3b1928f 100644 --- a/src/backends/rs_vand/liberasurecode_rs_vand.c +++ b/src/backends/rs_vand/liberasurecode_rs_vand.c @@ -31,15 +31,15 @@ #include "erasurecode_backend.h" #include "erasurecode_helpers.h" -#define INTERNAL_RS_VAND_LIB_MAJOR 1 -#define INTERNAL_RS_VAND_LIB_MINOR 0 -#define INTERNAL_RS_VAND_LIB_REV 0 -#define INTERNAL_RS_VAND_LIB_VER_STR "1.0" -#define INTERNAL_RS_VAND_LIB_NAME "liberasurecode_rs_vand" +#define LIBERASURECODE_RS_VAND_LIB_MAJOR 1 +#define LIBERASURECODE_RS_VAND_LIB_MINOR 0 +#define LIBERASURECODE_RS_VAND_LIB_REV 0 +#define LIBERASURECODE_RS_VAND_LIB_VER_STR "1.0" +#define LIBERASURECODE_RS_VAND_LIB_NAME "liberasurecode_rs_vand" #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__) -#define INTERNAL_RS_VAND_SO_NAME "liberasurecode_rs_vand.dylib" +#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand.dylib" #else -#define INTERNAL_RS_VAND_SO_NAME "liberasurecode_rs_vand.so" +#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand.so" #endif /* Forward declarations */ @@ -300,13 +300,13 @@ struct ec_backend_op_stubs liberasurecode_rs_vand_op_stubs = { }; struct ec_backend_common backend_liberasurecode_rs_vand = { - .id = EC_BACKEND_INTERNAL_RS_VAND, - .name = INTERNAL_RS_VAND_LIB_NAME, - .soname = INTERNAL_RS_VAND_SO_NAME, - .soversion = INTERNAL_RS_VAND_LIB_VER_STR, + .id = EC_BACKEND_LIBERASURECODE_RS_VAND, + .name = LIBERASURECODE_RS_VAND_LIB_NAME, + .soname = LIBERASURECODE_RS_VAND_SO_NAME, + .soversion = LIBERASURECODE_RS_VAND_LIB_VER_STR, .ops = &liberasurecode_rs_vand_op_stubs, .backend_metadata_size = 0, - .ec_backend_version = _VERSION(INTERNAL_RS_VAND_LIB_MAJOR, - INTERNAL_RS_VAND_LIB_MINOR, - INTERNAL_RS_VAND_LIB_REV), + .ec_backend_version = _VERSION(LIBERASURECODE_RS_VAND_LIB_MAJOR, + LIBERASURECODE_RS_VAND_LIB_MINOR, + LIBERASURECODE_RS_VAND_LIB_REV), }; diff --git a/test/liberasurecode_test.c b/test/liberasurecode_test.c index e4539cd..ff4641a 100644 --- a/test/liberasurecode_test.c +++ b/test/liberasurecode_test.c @@ -280,7 +280,7 @@ char * get_name_from_backend_id(ec_backend_id_t be) { return ISA_L_RS_VAND_BACKEND; case EC_BACKEND_SHSS: return SHSS_BACKEND; - case EC_BACKEND_INTERNAL_RS_VAND: + case EC_BACKEND_LIBERASURECODE_RS_VAND: return RS_VAND_BACKEND; default: return "UNKNOWN"; @@ -304,7 +304,7 @@ struct ec_args *create_ec_args(ec_backend_id_t be, ec_checksum_type_t ct, int ba case EC_BACKEND_JERASURE_RS_CAUCHY: backend_args_array = jerasure_rs_cauchy_test_args; break; - case EC_BACKEND_INTERNAL_RS_VAND: + case EC_BACKEND_LIBERASURECODE_RS_VAND: backend_args_array = liberasurecode_rs_vand_test_args; break; case EC_BACKEND_FLAT_XOR_HD: @@ -1833,63 +1833,63 @@ struct testcase testcases[] = { // Internal RS Vand backend tests {"create_and_destroy_backend", test_create_and_destroy_backend, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"simple_encode_liberasurecode_rs_vand", test_simple_encode_decode, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"decode_with_missing_data_liberasurecode_rs_vand", test_decode_with_missing_data, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"decode_with_missing_multi_data_liberasurecode_rs_vand", test_decode_with_missing_multi_data, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"decode_with_missing_multi_parity_liberasurecode_rs_vand", test_decode_with_missing_multi_parity, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"test_decode_with_missing_multi_data_parity_liberasurecode_rs_vand", test_decode_with_missing_multi_data_parity, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"simple_reconstruct_liberasurecode_rs_vand", test_simple_reconstruct, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"test_fragments_needed_liberasurecode_rs_vand", test_fragments_needed, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"test_get_fragment_metadata_liberasurecode_rs_vand", test_get_fragment_metadata, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE, .skip = false}, {"test_get_fragment_metadata_liberasurecode_rs_vand_crc32", test_get_fragment_metadata, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32, .skip = false}, {"test_verify_stripe_metadata", test_verify_stripe_metadata, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32, .skip = false}, {"test_verify_stripe_metadata_libec_mismatch", test_verify_stripe_metadata_libec_mismatch, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32, .skip = false}, {"test_verify_stripe_metadata_magic_mismatch", test_verify_stripe_metadata_magic_mismatch, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32, .skip = false}, {"test_verify_stripe_metadata_be_id_mismatch", test_verify_stripe_metadata_be_id_mismatch, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32, .skip = false}, {"test_verify_stripe_metadata_be_ver_mismatch", test_verify_stripe_metadata_be_ver_mismatch, - EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32, + EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32, .skip = false}, { NULL, NULL, 0, 0, false }, }; |