diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | include/erasurecode/alg_sig.h | 8 | ||||
| -rw-r--r-- | include/erasurecode/erasurecode.h | 2 | ||||
| -rw-r--r-- | include/erasurecode/galois.h | 101 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/erasurecode.c | 6 | ||||
| -rw-r--r-- | src/utils/chksum/alg_sig.c | 71 | ||||
| -rw-r--r-- | src/utils/chksum/galois.c | 1131 | ||||
| -rw-r--r-- | test/Makefile.am | 7 | ||||
| -rw-r--r-- | test/liberasurecode_test.c | 2 |
11 files changed, 70 insertions, 1281 deletions
diff --git a/Makefile.am b/Makefile.am index 5a22fb7..ffd6307 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ AM_CFLAGS = -fPIC $(AM_CPPFLAGS) -L/usr/local/lib include_HEADERS = \ include/erasurecode/alg_sig.h \ - include/erasurecode/galois.h \ include/erasurecode/erasurecode.h \ include/erasurecode/erasurecode_backend.h \ include/erasurecode/erasurecode_helpers.h \ diff --git a/configure.ac b/configure.ac index 21c7df7..28e7246 100644 --- a/configure.ac +++ b/configure.ac @@ -32,23 +32,6 @@ AC_CHECK_HEADERS(sys/types.h stdio.h stdlib.h stddef.h stdarg.h malloc.h memory. signal.h dlfcn.h pthread.h unistd.h limits.h errno.h syslog.h) AC_CHECK_FUNCS(malloc calloc realloc free openlog) -# Check for gf_complete headers -AC_CHECK_HEADERS(galois.h gf_complete.h) - -# Enable this check when gf_complete is external -AC_CHECK_LIB([gf_complete], [gf_init_easy], -[ - AM_CONDITIONAL([GF_COMPLETE_INSTALLED], [true]) - AC_DEFINE([HAVE_LIBGF_COMPLETE], [1], ["Defined if gf-complete is installed"]) -], -[ - echo "Warning gf_complete is required for *high performance* algorithmic signature support." - echo "gf_complete is available from https://bitbucket.org/jimplank/gf-complete.git" - echo "On Debian/Ubuntu systems, you can use \'apt-get install gf-complete\'" - echo "This will install with a slower Galois field backend!" - AM_CONDITIONAL([GF_COMPLETE_INSTALLED], [false]) -]) - AC_ARG_ENABLE([debug], [ --enable-debug Turn on debugging], [case "${enableval}" in diff --git a/include/erasurecode/alg_sig.h b/include/erasurecode/alg_sig.h index 1b3acec..32b35fb 100644 --- a/include/erasurecode/alg_sig.h +++ b/include/erasurecode/alg_sig.h @@ -27,10 +27,18 @@ #include "galois.h" +struct jerasure_mult_routines { + int (*galois_single_multiply)(int, int, int); +}; + +#define JERASURE_SONAME "libJerasure.dylib" + typedef struct alg_sig_s { int gf_w; int sig_len; + struct jerasure_mult_routines mult_routines; + void *jerasure_sohandle; int *tbl1_l; int *tbl1_r; int *tbl2_l; diff --git a/include/erasurecode/erasurecode.h b/include/erasurecode/erasurecode.h index 6b00ce4..57b89fa 100644 --- a/include/erasurecode/erasurecode.h +++ b/include/erasurecode/erasurecode.h @@ -159,7 +159,7 @@ int liberasurecode_encode(int desc, int liberasurecode_decode(int desc, char **available_fragments, /* input */ int num_fragments, uint64_t fragment_len, /* input */ - char *out_data, uint64_t *out_data_len); /* output */ + char **out_data, uint64_t *out_data_len); /* output */ /** * Reconstruct a missing fragment from a subset of available fragments diff --git a/include/erasurecode/galois.h b/include/erasurecode/galois.h deleted file mode 100644 index 54efb0f..0000000 --- a/include/erasurecode/galois.h +++ /dev/null @@ -1,101 +0,0 @@ -/* * - * Copyright (c) 2013, James S. Plank and Kevin Greenan - * All rights reserved. - * - * Jerasure - A C/C++ Library for a Variety of Reed-Solomon and RAID-6 Erasure - * Coding Techniques - * - * Revision 2.0: Galois Field backend now links to GF-Complete - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * - Neither the name of the University of Tennessee nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - - -#ifndef _GALOIS_H -#define _GALOIS_H - -#include <config.h> -#include <stdio.h> -#include <stdlib.h> -#ifdef HAVE_LIBGF_COMPLETE -#include <gf_complete.h> -extern void galois_change_technique(gf_t *gf, int w); -gf_t* galois_init_field(int w, - int mult_type, - int region_type, - int divide_type, - uint64_t prim_poly, - int arg1, - int arg2); - -gf_t* galois_init_composite_field(int w, - int region_type, - int divide_type, - int degree, - gf_t* base_gf); - -gf_t * galois_get_field_ptr(int w); -#endif - -extern int galois_single_multiply(int a, int b, int w); -extern int galois_single_divide(int a, int b, int w); -extern int galois_inverse(int x, int w); - -void galois_region_xor( char *src, /* Source Region */ - char *dest, /* Dest Region (holds result) */ - int nbytes); /* Number of bytes in region */ - -/* These multiply regions in w=8, w=16 and w=32. They are much faster - than calling galois_single_multiply. The regions must be long word aligned. */ - -void galois_w08_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here. - Otherwise region is overwritten */ - int add); /* If (r2 != NULL && add) the produce is XOR'd with r2 */ - -void galois_w16_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here. - Otherwise region is overwritten */ - int add); /* If (r2 != NULL && add) the produce is XOR'd with r2 */ - -void galois_w32_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here. - Otherwise region is overwritten */ - int add); /* If (r2 != NULL && add) the produce is XOR'd with r2 */ - - - -#endif diff --git a/src/Makefile.am b/src/Makefile.am index 3d13226..2bbbca1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,6 @@ liberasurecode_la_SOURCES = \ erasurecode_postprocessing.c \ utils/chksum/crc32.c \ utils/chksum/alg_sig.c \ - utils/chksum/galois.c \ backends/xor/flat_xor_hd.c \ backends/jerasure/jerasure_rs_vand.c @@ -22,10 +21,6 @@ liberasurecode_la_CPPFLAGS = -Werror liberasurecode_la_LIBADD = \ builtin/xor_codes/libXorcode.la -lpthread -lm -if GF_COMPLETE_INSTALLED - liberasurecode_la_LIBADD += -lgf_complete -endif - # Version format (C - A).(A).(R) for C:R:A input liberasurecode_la_LDFLAGS = -rpath '$(libdir)' -version-info 9:10:9 diff --git a/src/erasurecode.c b/src/erasurecode.c index 5905467..edb02ce 100644 --- a/src/erasurecode.c +++ b/src/erasurecode.c @@ -386,7 +386,7 @@ out: int liberasurecode_decode(int desc, char **available_fragments, /* input */ int num_fragments, uint64_t fragment_len, /* input */ - char *out_data, uint64_t *out_data_len) /* output */ + char **out_data, uint64_t *out_data_len) /* output */ { int i, j; int ret = 0; @@ -415,7 +415,7 @@ int liberasurecode_decode(int desc, */ ret = fragments_to_string(k, m, available_fragments, num_fragments, - &out_data, out_data_len); + out_data, out_data_len); if (ret == 0) { /* We were able to get the original data without decoding! */ @@ -507,7 +507,7 @@ int liberasurecode_decode(int desc, } /* Try to generate the original string */ - ret = fragments_to_string(k, m, data, k, &out_data, out_data_len); + ret = fragments_to_string(k, m, data, k, out_data, out_data_len); if (ret < 0) { log_error("Could not prepare convert decoded fragments to a string!"); diff --git a/src/utils/chksum/alg_sig.c b/src/utils/chksum/alg_sig.c index f1dcff5..f8329b8 100644 --- a/src/utils/chksum/alg_sig.c +++ b/src/utils/chksum/alg_sig.c @@ -22,6 +22,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <dlfcn.h> #include <alg_sig.h> #include <stdlib.h> #include <string.h> @@ -29,6 +30,19 @@ int valid_gf_w[] = { 8, 16, -1 }; int valid_pairs[][2] = { { 8, 32}, {16, 32}, {16, 64}, {-1, -1} }; +void *get_jerasure_sohandle() +{ + return dlopen(JERASURE_SONAME, RTLD_LAZY | RTLD_LOCAL); +} + +int load_gf_functions(void *sohandle, struct jerasure_mult_routines *routines) +{ + routines->galois_single_multiply = dlsym(sohandle, "galois_single_multiply"); + if (NULL == routines->galois_single_multiply) { + return -1; + } + return 0; +} static alg_sig_t *init_alg_sig_w8(int sig_len) @@ -39,9 +53,23 @@ alg_sig_t *init_alg_sig_w8(int sig_len) int w = 8; int alpha = 2, beta = 4, gamma = 8; int num_components = sig_len / w; + struct jerasure_mult_routines g_jerasure_mult_routines; + + void *jerasure_sohandle = get_jerasure_sohandle(); + + if (NULL == jerasure_sohandle) { + return NULL; + } alg_sig_handle = (alg_sig_t *)malloc(sizeof(alg_sig_t)); - if (alg_sig_handle == NULL) { + if (NULL == alg_sig_handle) { + return NULL; + } + + alg_sig_handle->jerasure_sohandle = jerasure_sohandle; + + if (load_gf_functions(alg_sig_handle->jerasure_sohandle, &(alg_sig_handle->mult_routines)) < 0) { + free(alg_sig_handle); return NULL; } @@ -66,14 +94,14 @@ alg_sig_t *init_alg_sig_w8(int sig_len) */ for (i = 0; i < 16; i++) { if (num_components >= 4) { - alg_sig_handle->tbl1_l[i] = galois_single_multiply((unsigned char) (i << 4) & 0xf0, alpha, w); - alg_sig_handle->tbl1_r[i] = galois_single_multiply((unsigned char) i, alpha, w); + alg_sig_handle->tbl1_l[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned char)(i << 4) & 0xf0, alpha, w); + alg_sig_handle->tbl1_r[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned char) i, alpha, w); - alg_sig_handle->tbl2_l[i] = galois_single_multiply((unsigned char) (i << 4) & 0xf0, beta, w); - alg_sig_handle->tbl2_r[i] = galois_single_multiply((unsigned char) i, beta, w); + alg_sig_handle->tbl2_l[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned char) (i << 4) & 0xf0, beta, w); + alg_sig_handle->tbl2_r[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned char) i, beta, w); - alg_sig_handle->tbl3_l[i] = galois_single_multiply((unsigned char) (i << 4) & 0xf0, gamma, w); - alg_sig_handle->tbl3_r[i] = galois_single_multiply((unsigned char) i, gamma, w); + alg_sig_handle->tbl3_l[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned char) (i << 4) & 0xf0, gamma, w); + alg_sig_handle->tbl3_r[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned char) i, gamma, w); } } @@ -89,12 +117,24 @@ alg_sig_t *init_alg_sig_w16(int sig_len) int w = 16; int alpha = 2, beta = 4, gamma = 8; int num_components = sig_len / w; - + + void *jerasure_sohandle = get_jerasure_sohandle(); + if (jerasure_sohandle == NULL) { + return NULL; + } + alg_sig_handle = (alg_sig_t *)malloc(sizeof(alg_sig_t)); if (alg_sig_handle == NULL) { return NULL; } + alg_sig_handle->jerasure_sohandle = jerasure_sohandle; + + if (load_gf_functions(alg_sig_handle->jerasure_sohandle, &(alg_sig_handle->mult_routines)) < 0) { + free(alg_sig_handle); + return NULL; + } + alg_sig_handle->sig_len = sig_len; alg_sig_handle->gf_w = w; @@ -118,15 +158,15 @@ alg_sig_t *init_alg_sig_w16(int sig_len) * Note that \gamme = 8 (\alpha ^ 3 MOD 2^16) */ for (i = 0; i < 256; i++) { - alg_sig_handle->tbl1_l[i] = galois_single_multiply((unsigned short) (i << 8), alpha, w); - alg_sig_handle->tbl1_r[i] = galois_single_multiply((unsigned short) i, alpha, w); + alg_sig_handle->tbl1_l[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned short) (i << 8), alpha, w); + alg_sig_handle->tbl1_r[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned short) i, alpha, w); if (num_components >= 4) { - alg_sig_handle->tbl2_l[i] = galois_single_multiply((unsigned short) (i << 8), beta, w); - alg_sig_handle->tbl2_r[i] = galois_single_multiply((unsigned short) i, beta, w); + alg_sig_handle->tbl2_l[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned short) (i << 8), beta, w); + alg_sig_handle->tbl2_r[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned short) i, beta, w); - alg_sig_handle->tbl3_l[i] = galois_single_multiply((unsigned short) (i << 8), gamma, w); - alg_sig_handle->tbl3_r[i] = galois_single_multiply((unsigned short) i, gamma, w); + alg_sig_handle->tbl3_l[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned short) (i << 8), gamma, w); + alg_sig_handle->tbl3_r[i] = alg_sig_handle->mult_routines.galois_single_multiply((unsigned short) i, gamma, w); } } @@ -165,6 +205,9 @@ void destroy_alg_sig(alg_sig_t* alg_sig_handle) free(alg_sig_handle); return; } + + dlclose(alg_sig_handle->jerasure_sohandle); + int num_components = alg_sig_handle->sig_len / alg_sig_handle->gf_w; free(alg_sig_handle->tbl1_l); diff --git a/src/utils/chksum/galois.c b/src/utils/chksum/galois.c deleted file mode 100644 index 37fb6ae..0000000 --- a/src/utils/chksum/galois.c +++ /dev/null @@ -1,1131 +0,0 @@ -/* * - * Copyright (c) 2014, James S. Plank and Kevin Greenan - * All rights reserved. - * - * Jerasure - A C/C++ Library for a Variety of Reed-Solomon and RAID-6 Erasure - * Coding Techniques - * - * Revision 2.0: Galois Field backend now links to GF-Complete - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * - Neither the name of the University of Tennessee nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* Jerasure's authors: - - Revision 2.x - 2014: James S. Plank and Kevin M. Greenan - Revision 1.2 - 2008: James S. Plank, Scott Simmerman and Catherine D. Schuman. - Revision 1.0 - 2007: James S. Plank - */ - -#include "erasurecode_stdinc.h" -#include "galois.h" - -#ifdef HAVE_LIBGF_COMPLETE -#define MAX_GF_INSTANCES 64 -gf_t *gfp_array[MAX_GF_INSTANCES] = { 0 }; -int gfp_is_composite[MAX_GF_INSTANCES] = { 0 }; - -gf_t *galois_get_field_ptr(int w) -{ - if (gfp_array[w] != NULL) { - return gfp_array[w]; - } - - return NULL; -} - -gf_t* galois_init_field(int w, - int mult_type, - int region_type, - int divide_type, - uint64_t prim_poly, - int arg1, - int arg2) -{ - int scratch_size; - void *scratch_memory; - gf_t *gfp; - - if (w <= 0 || w > 32) { - log_error("ERROR -- cannot init default Galois field for w=%d\n", w); - return NULL; - } - - gfp = (gf_t *) malloc(sizeof(gf_t)); - if (!gfp) { - log_error("ERROR -- cannot allocate memory for Galois field w=%d\n", w); - return NULL; - } - - scratch_size = gf_scratch_size(w, mult_type, region_type, divide_type, arg1, arg2); - if (!scratch_size) { - log_error("ERROR -- cannot get scratch size for base field w=%d\n", w); - return NULL; - } - - scratch_memory = malloc(scratch_size); - if (!scratch_memory) { - log_error("ERROR -- cannot get scratch memory for base field w=%d\n", w); - return NULL; - } - - if(!gf_init_hard(gfp, - w, - mult_type, - region_type, - divide_type, - prim_poly, - arg1, - arg2, - NULL, - scratch_memory)) - { - log_error("ERROR -- cannot init default Galois field for w=%d\n", w); - return NULL; - } - - gfp_is_composite[w] = 0; - return gfp; -} - -gf_t* galois_init_composite_field(int w, - int region_type, - int divide_type, - int degree, - gf_t* base_gf) -{ - int scratch_size; - void *scratch_memory; - gf_t *gfp; - - if (w <= 0 || w > 32) { - log_error("ERROR -- cannot init composite field for w=%d\n", w); - return NULL; - } - - gfp = (gf_t *) malloc(sizeof(gf_t)); - if (!gfp) { - log_error("ERROR -- cannot allocate memory for Galois field w=%d\n", w); - return NULL; - } - - scratch_size = gf_scratch_size(w, GF_MULT_COMPOSITE, region_type, divide_type, degree, 0); - if (!scratch_size) { - log_error("ERROR -- cannot get scratch size for composite field w=%d\n", w); - return NULL; - } - - scratch_memory = malloc(scratch_size); - if (!scratch_memory) { - log_error("ERROR -- cannot get scratch memory for composite field w=%d\n", w); - return NULL; - } - - if(!gf_init_hard(gfp, - w, - GF_MULT_COMPOSITE, - region_type, - divide_type, - 0, - degree, - 0, - base_gf, - scratch_memory)) - { - log_error("ERROR -- cannot init default composite field for w=%d\n", w); - return NULL; - } - gfp_is_composite[w] = 1; - return gfp; -} - -static void galois_init_default_field(int w) -{ - if (w <= 0 || w > 32) { - log_error("ERROR -- cannot init default Galois field for w=%d\n", w); - return; - } - - if (gfp_array[w] == NULL) { - gfp_array[w] = (gf_t*)malloc(sizeof(gf_t)); - if (gfp_array[w] == NULL) { - log_error("ERROR -- cannot allocate memory for Galois field w=%d\n", w); - return; - } - } - - if (!gf_init_easy(gfp_array[w], w)) { - log_error("ERROR -- cannot init default Galois field for w=%d\n", w); - return; - } -} - - -static int is_valid_gf(gf_t *gf, int w) -{ - // TODO: I assume we may eventually - // want to do w=64 and 128, so w - // will be needed to perform this check - (void)w; - - if (gf == NULL) { - return 0; - } - if (gf->multiply.w32 == NULL) { - return 0; - } - if (gf->multiply_region.w32 == NULL) { - return 0; - } - if (gf->divide.w32 == NULL) { - return 0; - } - if (gf->inverse.w32 == NULL) { - return 0; - } - if (gf->extract_word.w32 == NULL) { - return 0; - } - - return 1; -} - -void galois_change_technique(gf_t *gf, int w) -{ - if (w <= 0 || w > 32) { - log_error("ERROR -- cannot support Galois field for w=%d\n", w); - return; - } - - if (!is_valid_gf(gf, w)) { - log_error("ERROR -- overriding with invalid Galois field for w=%d\n", w); - return; - } - - if (gfp_array[w] != NULL) { - gf_free(gfp_array[w], gfp_is_composite[w]); - } - - gfp_array[w] = gf; -} - -int galois_single_multiply(int x, int y, int w) -{ - if (x == 0 || y == 0) return 0; - - if (gfp_array[w] == NULL) { - galois_init_default_field(w); - } - - if (w <= 32) { - return gfp_array[w]->multiply.w32(gfp_array[w], x, y); - } else { - log_error("ERROR -- Galois field not implemented for w=%d\n", w); - } -} - -int galois_single_divide(int x, int y, int w) -{ - if (x == 0) return 0; - if (y == 0) return -1; - - if (gfp_array[w] == NULL) { - galois_init_default_field(w); - } - - if (w <= 32) { - return gfp_array[w]->divide.w32(gfp_array[w], x, y); - } else { - log_error("ERROR -- Galois field not implemented for w=%d\n", w); - } -} - -void galois_w08_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here */ - int add) -{ - if (gfp_array[8] == NULL) { - galois_init_default_field(8); - } - gfp_array[8]->multiply_region.w32(gfp_array[8], region, r2, multby, nbytes, add); -} - -void galois_w16_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here */ - int add) -{ - if (gfp_array[16] == NULL) { - galois_init_default_field(16); - } - gfp_array[16]->multiply_region.w32(gfp_array[16], region, r2, multby, nbytes, add); -} - - -void galois_w32_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here */ - int add) -{ - if (gfp_array[32] == NULL) { - galois_init_default_field(32); - } - gfp_array[32]->multiply_region.w32(gfp_array[32], region, r2, multby, nbytes, add); -} - -void galois_w8_region_xor(void *src, void *dest, int nbytes) -{ - if (gfp_array[8] == NULL) { - galois_init_default_field(8); - } - gfp_array[8]->multiply_region.w32(gfp_array[32], src, dest, 1, nbytes, 1); -} - -void galois_w16_region_xor(void *src, void *dest, int nbytes) -{ - if (gfp_array[16] == NULL) { - galois_init_default_field(16); - } - gfp_array[16]->multiply_region.w32(gfp_array[16], src, dest, 1, nbytes, 1); -} - -void galois_w32_region_xor(void *src, void *dest, int nbytes) -{ - if (gfp_array[32] == NULL) { - galois_init_default_field(32); - } - gfp_array[32]->multiply_region.w32(gfp_array[32], src, dest, 1, nbytes, 1); -} - -void galois_region_xor(char *src, char *dest, int nbytes) -{ - if (nbytes >= 16) { - galois_w32_region_xor(src, dest, nbytes); - } else { - int i = 0; - for (i = 0; i < nbytes; i++) { - *dest ^= *src; - dest++; - src++; - } - } -} - -int galois_inverse(int y, int w) -{ - if (y == 0) return -1; - return galois_single_divide(1, y, w); -} - -#else - -#define NONE (10) -#define TABLE (11) -#define SHIFT (12) -#define LOGS (13) -#define SPLITW8 (14) - -static int prim_poly[33] = -{ 0, -/* 1 */ 1, -/* 2 */ 07, -/* 3 */ 013, -/* 4 */ 023, -/* 5 */ 045, -/* 6 */ 0103, -/* 7 */ 0211, -/* 8 */ 0435, -/* 9 */ 01021, -/* 10 */ 02011, -/* 11 */ 04005, -/* 12 */ 010123, -/* 13 */ 020033, -/* 14 */ 042103, -/* 15 */ 0100003, -/* 16 */ 0210013, -/* 17 */ 0400011, -/* 18 */ 01000201, -/* 19 */ 02000047, -/* 20 */ 04000011, -/* 21 */ 010000005, -/* 22 */ 020000003, -/* 23 */ 040000041, -/* 24 */ 0100000207, -/* 25 */ 0200000011, -/* 26 */ 0400000107, -/* 27 */ 01000000047, -/* 28 */ 02000000011, -/* 29 */ 04000000005, -/* 30 */ 010040000007, -/* 31 */ 020000000011, -/* 32 */ 00020000007 }; /* Really 40020000007, but we're omitting the high order bit */ - -static int mult_type[33] = -{ NONE, -/* 1 */ TABLE, -/* 2 */ TABLE, -/* 3 */ TABLE, -/* 4 */ TABLE, -/* 5 */ TABLE, -/* 6 */ TABLE, -/* 7 */ TABLE, -/* 8 */ TABLE, -/* 9 */ TABLE, -/* 10 */ LOGS, -/* 11 */ LOGS, -/* 12 */ LOGS, -/* 13 */ LOGS, -/* 14 */ LOGS, -/* 15 */ LOGS, -/* 16 */ LOGS, -/* 17 */ LOGS, -/* 18 */ LOGS, -/* 19 */ LOGS, -/* 20 */ LOGS, -/* 21 */ LOGS, -/* 22 */ LOGS, -/* 23 */ SHIFT, -/* 24 */ SHIFT, -/* 25 */ SHIFT, -/* 26 */ SHIFT, -/* 27 */ SHIFT, -/* 28 */ SHIFT, -/* 29 */ SHIFT, -/* 30 */ SHIFT, -/* 31 */ SHIFT, -/* 32 */ SPLITW8 }; - -static int nw[33] = { 0, (1 << 1), (1 << 2), (1 << 3), (1 << 4), -(1 << 5), (1 << 6), (1 << 7), (1 << 8), (1 << 9), (1 << 10), -(1 << 11), (1 << 12), (1 << 13), (1 << 14), (1 << 15), (1 << 16), -(1 << 17), (1 << 18), (1 << 19), (1 << 20), (1 << 21), (1 << 22), -(1 << 23), (1 << 24), (1 << 25), (1 << 26), (1 << 27), (1 << 28), -(1 << 29), (1 << 30), (1 << 31), -1 }; - -static int nwm1[33] = { 0, (1 << 1)-1, (1 << 2)-1, (1 << 3)-1, (1 << 4)-1, -(1 << 5)-1, (1 << 6)-1, (1 << 7)-1, (1 << 8)-1, (1 << 9)-1, (1 << 10)-1, -(1 << 11)-1, (1 << 12)-1, (1 << 13)-1, (1 << 14)-1, (1 << 15)-1, (1 << 16)-1, -(1 << 17)-1, (1 << 18)-1, (1 << 19)-1, (1 << 20)-1, (1 << 21)-1, (1 << 22)-1, -(1 << 23)-1, (1 << 24)-1, (1 << 25)-1, (1 << 26)-1, (1 << 27)-1, (1 << 28)-1, -(1 << 29)-1, (1 << 30)-1, 0x7fffffff, 0xffffffff }; - -static int *galois_log_tables[33] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - -static int *galois_ilog_tables[33] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - -static int *galois_mult_tables[33] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - -static int *galois_div_tables[33] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - -/* Special case for w = 32 */ - -static int *galois_split_w8[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - -int galois_create_log_tables(int w) -{ - int j, b; - - if (w > 30) return -1; - if (galois_log_tables[w] != NULL) return 0; - galois_log_tables[w] = (int *) malloc(sizeof(int)*nw[w]); - if (galois_log_tables[w] == NULL) return -1; - - galois_ilog_tables[w] = (int *) malloc(sizeof(int)*nw[w]*3); - if (galois_ilog_tables[w] == NULL) { - free(galois_log_tables[w]); - galois_log_tables[w] = NULL; - return -1; - } - - for (j = 0; j < nw[w]; j++) { - galois_log_tables[w][j] = nwm1[w]; - galois_ilog_tables[w][j] = 0; - } - - b = 1; - for (j = 0; j < nwm1[w]; j++) { - if (galois_log_tables[w][b] != nwm1[w]) { - log_error("Galois_create_log_tables Error: j=%d, b=%d, B->J[b]=%d, J->B[j]=%d (0%o)\n", - j, b, galois_log_tables[w][b], galois_ilog_tables[w][j], (b << 1) ^ prim_poly[w]); - return -1; - } - galois_log_tables[w][b] = j; - galois_ilog_tables[w][j] = b; - b = b << 1; - if (b & nw[w]) b = (b ^ prim_poly[w]) & nwm1[w]; - } - for (j = 0; j < nwm1[w]; j++) { - galois_ilog_tables[w][j+nwm1[w]] = galois_ilog_tables[w][j]; - galois_ilog_tables[w][j+nwm1[w]*2] = galois_ilog_tables[w][j]; - } - galois_ilog_tables[w] += nwm1[w]; - return 0; -} - -int galois_logtable_multiply(int x, int y, int w) -{ - int sum_j; - - if (x == 0 || y == 0) return 0; - - sum_j = galois_log_tables[w][x] + galois_log_tables[w][y]; - /* if (sum_j >= nwm1[w]) sum_j -= nwm1[w]; Don't need to do this, - because we replicate the ilog table twice. */ - return galois_ilog_tables[w][sum_j]; -} - -int galois_logtable_divide(int x, int y, int w) -{ - int sum_j; - int z; - - if (y == 0) return -1; - if (x == 0) return 0; - sum_j = galois_log_tables[w][x] - galois_log_tables[w][y]; - /* if (sum_j < 0) sum_j += nwm1[w]; Don't need to do this, because we replicate the ilog table twice. */ - z = galois_ilog_tables[w][sum_j]; - return z; -} - -int galois_create_mult_tables(int w) -{ - int j, x, y, logx; - - if (w >= 14) return -1; - - if (galois_mult_tables[w] != NULL) return 0; - galois_mult_tables[w] = (int *) malloc(sizeof(int) * nw[w] * nw[w]); - if (galois_mult_tables[w] == NULL) return -1; - - galois_div_tables[w] = (int *) malloc(sizeof(int) * nw[w] * nw[w]); - if (galois_div_tables[w] == NULL) { - free(galois_mult_tables[w]); - galois_mult_tables[w] = NULL; - return -1; - } - if (galois_log_tables[w] == NULL) { - if (galois_create_log_tables(w) < 0) { - free(galois_mult_tables[w]); - free(galois_div_tables[w]); - galois_mult_tables[w] = NULL; - galois_div_tables[w] = NULL; - return -1; - } - } - - /* Set mult/div tables for x = 0 */ - j = 0; - galois_mult_tables[w][j] = 0; /* y = 0 */ - galois_div_tables[w][j] = -1; - j++; - for (y = 1; y < nw[w]; y++) { /* y > 0 */ - galois_mult_tables[w][j] = 0; - galois_div_tables[w][j] = 0; - j++; - } - - for (x = 1; x < nw[w]; x++) { /* x > 0 */ - galois_mult_tables[w][j] = 0; /* y = 0 */ - galois_div_tables[w][j] = -1; - j++; - logx = galois_log_tables[w][x]; - for (y = 1; y < nw[w]; y++) { /* y > 0 */ - galois_mult_tables[w][j] = galois_ilog_tables[w][logx+galois_log_tables[w][y]]; - galois_div_tables[w][j] = galois_ilog_tables[w][logx-galois_log_tables[w][y]]; - j++; - } - } - return 0; -} - -int galois_ilog(int value, int w) -{ - if (galois_ilog_tables[w] == NULL) { - if (galois_create_log_tables(w) < 0) { - log_error("Error: galois_ilog - w is too big. Sorry\n"); - return -1; - } - } - return galois_ilog_tables[w][value]; -} - -int galois_log(int value, int w) -{ - if (galois_log_tables[w] == NULL) { - if (galois_create_log_tables(w) < 0) { - log_error("Error: galois_log - w is too big. Sorry\n"); - return -1; - } - } - return galois_log_tables[w][value]; -} - - -int galois_shift_multiply(int x, int y, int w) -{ - int prod; - int i, j, ind; - int k; - int scratch[33]; - - prod = 0; - for (i = 0; i < w; i++) { - scratch[i] = y; - if (y & (1 << (w-1))) { - y = y << 1; - y = (y ^ prim_poly[w]) & nwm1[w]; - } else { - y = y << 1; - } - } - for (i = 0; i < w; i++) { - ind = (1 << i); - if (ind & x) { - j = 1; - for (k = 0; k < w; k++) { - prod = prod ^ (j & scratch[i]); - j = (j << 1); - } - } - } - return prod; -} - -int galois_single_multiply(int x, int y, int w) -{ - int sum_j; - int z; - - if (x == 0 || y == 0) return 0; - - if (mult_type[w] == TABLE) { - if (galois_mult_tables[w] == NULL) { - if (galois_create_mult_tables(w) < 0) { - log_error("ERROR -- cannot make multiplication tables for w=%d\n", w); - return -1; - } - } - return galois_mult_tables[w][(x<<w)|y]; - } else if (mult_type[w] == LOGS) { - if (galois_log_tables[w] == NULL) { - if (galois_create_log_tables(w) < 0) { - log_error("ERROR -- cannot make log tables for w=%d\n", w); - return -1; - } - } - sum_j = galois_log_tables[w][x] + galois_log_tables[w][y]; - z = galois_ilog_tables[w][sum_j]; - return z; - } else if (mult_type[w] == SPLITW8) { - if (galois_split_w8[0] == NULL) { - if (galois_create_split_w8_tables() < 0) { - log_error("ERROR -- cannot make log split_w8_tables for w=%d\n", w); - return -1; - } - } - return galois_split_w8_multiply(x, y); - } else if (mult_type[w] == SHIFT) { - return galois_shift_multiply(x, y, w); - } - log_error("Galois_single_multiply - no implementation for w=%d\n", w); - return -1; -} - -int galois_multtable_multiply(int x, int y, int w) -{ - return galois_mult_tables[w][(x<<w)|y]; -} - -int galois_single_divide(int a, int b, int w) -{ - int sum_j; - - if (mult_type[w] == TABLE) { - if (galois_div_tables[w] == NULL) { - if (galois_create_mult_tables(w) < 0) { - log_error("ERROR -- cannot make multiplication tables for w=%d\n", w); - return -1; - } - } - return galois_div_tables[w][(a<<w)|b]; - } else if (mult_type[w] == LOGS) { - if (b == 0) return -1; - if (a == 0) return 0; - if (galois_log_tables[w] == NULL) { - if (galois_create_log_tables(w) < 0) { - log_error("ERROR -- cannot make log tables for w=%d\n", w); - return -1; - } - } - sum_j = galois_log_tables[w][a] - galois_log_tables[w][b]; - return galois_ilog_tables[w][sum_j]; - } else { - if (b == 0) return -1; - if (a == 0) return 0; - sum_j = galois_inverse(b, w); - return galois_single_multiply(a, sum_j, w); - } - log_error("Galois_single_divide - no implementation for w=%d\n", w); - return -1; -} - -int galois_shift_divide(int a, int b, int w) -{ - int inverse; - - if (b == 0) return -1; - if (a == 0) return 0; - inverse = galois_shift_inverse(b, w); - return galois_shift_multiply(a, inverse, w); -} - -int galois_multtable_divide(int x, int y, int w) -{ - return galois_div_tables[w][(x<<w)|y]; -} - -void galois_w08_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here */ - int add) -{ - unsigned char *ur1, *ur2, *cp; - unsigned char prod; - int i, srow, j; - unsigned long l, *lp2; - unsigned char *lp; - int sol; - - ur1 = (unsigned char *) region; - ur2 = (r2 == NULL) ? ur1 : (unsigned char *) r2; - -/* This is used to test its performance with respect to just calling galois_single_multiply - if (r2 == NULL || !add) { - for (i = 0; i < nbytes; i++) ur2[i] = galois_single_multiply(ur1[i], multby, 8); - } else { - for (i = 0; i < nbytes; i++) { - ur2[i] = (ur2[i]^galois_single_multiply(ur1[i], multby, 8)); - } - } - */ - - if (galois_mult_tables[8] == NULL) { - if (galois_create_mult_tables(8) < 0) { - log_error("galois_08_region_multiply -- couldn't make multiplication tables\n"); - return; - } - } - srow = multby * nw[8]; - if (r2 == NULL || !add) { - for (i = 0; i < nbytes; i++) { - prod = galois_mult_tables[8][srow+ur1[i]]; - ur2[i] = prod; - } - } else { - sol = sizeof(long); - lp2 = &l; - lp = (unsigned char *) lp2; - for (i = 0; i < nbytes; i += sol) { - cp = ur2+i; - lp2 = (unsigned long *) cp; - for (j = 0; j < sol; j++) { - prod = galois_mult_tables[8][srow+ur1[i+j]]; - lp[j] = prod; - } - *lp2 = (*lp2) ^ l; - } - } - return; -} - -int galois_w16_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here */ - int add) -{ - unsigned short *ur1, *ur2, *cp; - int prod; - int i, log1, j, log2; - unsigned long l, *lp2, *lptop; - unsigned short *lp; - int sol; - - ur1 = (unsigned short *) region; - ur2 = (r2 == NULL) ? ur1 : (unsigned short *) r2; - nbytes /= 2; - - -/* This is used to test its performance with respect to just calling galois_single_multiply */ -/* - if (r2 == NULL || !add) { - for (i = 0; i < nbytes; i++) ur2[i] = galois_single_multiply(ur1[i], multby, 16); - } else { - for (i = 0; i < nbytes; i++) { - ur2[i] = (ur2[i]^galois_single_multiply(ur1[i], multby, 16)); - } - } - return; - */ - - if (multby == 0) { - if (!add) { - lp2 = (unsigned long *) ur2; - ur2 += nbytes; - lptop = (unsigned long *) ur2; - while (lp2 < lptop) { *lp2 = 0; lp2++; } - } - return -1; - } - - if (galois_log_tables[16] == NULL) { - if (galois_create_log_tables(16) < 0) { - log_error("galois_16_region_multiply -- couldn't make log tables\n"); - return -1; - } - } - log1 = galois_log_tables[16][multby]; - - if (r2 == NULL || !add) { - for (i = 0; i < nbytes; i++) { - if (ur1[i] == 0) { - ur2[i] = 0; - } else { - prod = galois_log_tables[16][ur1[i]] + log1; - ur2[i] = galois_ilog_tables[16][prod]; - } - } - } else { - sol = sizeof(long)/2; - lp2 = &l; - lp = (unsigned short *) lp2; - for (i = 0; i < nbytes; i += sol) { - cp = ur2+i; - lp2 = (unsigned long *) cp; - for (j = 0; j < sol; j++) { - if (ur1[i+j] == 0) { - lp[j] = 0; - } else { - log2 = galois_log_tables[16][ur1[i+j]]; - prod = log2 + log1; - lp[j] = galois_ilog_tables[16][prod]; - } - } - *lp2 = (*lp2) ^ l; - } - } - return 0; -} - -int galois_inverse(int y, int w) -{ - - if (y == 0) return -1; - if (mult_type[w] == SHIFT || mult_type[w] == SPLITW8) return galois_shift_inverse(y, w); - return galois_single_divide(1, y, w); -} - -/* This will destroy mat, by the way */ - -int galois_invert_binary_matrix(int *mat, int *inv, int rows) -{ - int cols, i, j, k; - int tmp; - - cols = rows; - - for (i = 0; i < rows; i++) inv[i] = (1 << i); - - /* First -- convert into upper triangular */ - - for (i = 0; i < cols; i++) { - - /* Swap rows if we ave a zero i,i element. If we can't swap, then the - matrix was not invertible */ - - if ((mat[i] & (1 << i)) == 0) { - for (j = i+1; j < rows && (mat[j] & (1 << i)) == 0; j++) ; - if (j == rows) { - log_error("galois_invert_matrix: Matrix not invertible!!\n"); - return -1; - } - tmp = mat[i]; mat[i] = mat[j]; mat[j] = tmp; - tmp = inv[i]; inv[i] = inv[j]; inv[j] = tmp; - } - - /* Now for each j>i, add A_ji*Ai to Aj */ - for (j = i+1; j != rows; j++) { - if ((mat[j] & (1 << i)) != 0) { - mat[j] ^= mat[i]; - inv[j] ^= inv[i]; - } - } - } - - /* Now the matrix is upper triangular. Start at the top and multiply down */ - - for (i = rows-1; i >= 0; i--) { - for (j = 0; j < i; j++) { - if (mat[j] & (1 << i)) { - inv[j] ^= inv[i]; - } - } - } - - return 0; -} - -int galois_shift_inverse(int y, int w) -{ - int mat[1024], mat2[32]; - int inv[1024], inv2[32]; - int ind, i, j, k, prod; - - for (i = 0; i < w; i++) { - mat2[i] = y; - - if (y & nw[w-1]) { - y = y << 1; - y = (y ^ prim_poly[w]) & nwm1[w]; - } else { - y = y << 1; - } - } - - galois_invert_binary_matrix(mat2, inv2, w); - - return inv2[0]; -} - -int *galois_get_mult_table(int w) -{ - if (galois_mult_tables[w] == NULL) { - if (galois_create_mult_tables(w)) { - return NULL; - } - } - return galois_mult_tables[w]; -} - -int *galois_get_div_table(int w) -{ - if (galois_mult_tables[w] == NULL) { - if (galois_create_mult_tables(w)) { - return NULL; - } - } - return galois_div_tables[w]; -} - -int *galois_get_log_table(int w) -{ - if (galois_log_tables[w] == NULL) { - if (galois_create_log_tables(w)) { - return NULL; - } - } - return galois_log_tables[w]; -} - -int *galois_get_ilog_table(int w) -{ - if (galois_ilog_tables[w] == NULL) { - if (galois_create_log_tables(w)) { - return NULL; - } - } - return galois_ilog_tables[w]; -} - -int galois_w32_region_multiply(char *region, /* Region to multiply */ - int multby, /* Number to multiply by */ - int nbytes, /* Number of bytes in region */ - char *r2, /* If r2 != NULL, products go here */ - int add) -{ - unsigned int *ur1, *ur2, *cp, *ur2top; - unsigned long *lp2, *lptop; - int i, j, a, b, accumulator, i8, j8, k; - int acache[4]; - - ur1 = (unsigned int *) region; - ur2 = (r2 == NULL) ? ur1 : (unsigned int *) r2; - nbytes /= sizeof(int); - ur2top = ur2 + nbytes; - - if (galois_split_w8[0]== NULL) { - if (galois_create_split_w8_tables() < 0) { - log_error("galois_32_region_multiply -- couldn't make split multiplication tables\n"); - return -1; - } - } - - /* If we're overwriting r2, then we can't do better than just calling split_multiply. - We'll inline it here to save on the procedure call overhead */ - - i8 = 0; - for (i = 0; i < 4; i++) { - acache[i] = (((multby >> i8) & 255) << 8); - i8 += 8; - } - if (!add) { - for (k = 0; k < nbytes; k++) { - accumulator = 0; - for (i = 0; i < 4; i++) { - a = acache[i]; - j8 = 0; - for (j = 0; j < 4; j++) { - b = ((ur1[k] >> j8) & 255); - accumulator ^= galois_split_w8[i+j][a|b]; - j8 += 8; - } - } - ur2[k] = accumulator; - } - } else { - for (k = 0; k < nbytes; k++) { - accumulator = 0; - for (i = 0; i < 4; i++) { - a = acache[i]; - j8 = 0; - for (j = 0; j < 4; j++) { - b = ((ur1[k] >> j8) & 255); - accumulator ^= galois_split_w8[i+j][a|b]; - j8 += 8; - } - } - ur2[k] = (ur2[k] ^ accumulator); - } - } - return; -} - -void galois_region_xor( char *r1, /* Region 1 */ - char *r2, /* Region 2 */ - int nbytes) /* Number of bytes in region */ -{ - long *l1; - long *l2; - long *ltop; - char *ctop; - int res = nbytes % sizeof(long); - - ctop = r1 + (nbytes - res); - ltop = (long *) ctop; - l1 = (long *) r1; - l2 = (long *) r2; - - while (l1 < ltop) { - *l2 = ((*l1) ^ (*l2)); - l1++; - l2++; - } - - r1 = r1 + (nbytes - res); - r2 = r2 + (nbytes - res); - ctop = r1 + nbytes; - while (r1 < ctop) { - *r2 = ((*r1) ^ (*r2)); - r1++; - r2++; - } -} - -int galois_create_split_w8_tables() -{ - int p1, p2, i, j, p1elt, p2elt, index, ishift, jshift, *table; - - if (galois_split_w8[0] != NULL) return 0; - - if (galois_create_mult_tables(8) < 0) return -1; - - for (i = 0; i < 7; i++) { - galois_split_w8[i] = (int *) malloc(sizeof(int) * (1 << 16)); - if (galois_split_w8[i] == NULL) { - for (i--; i >= 0; i--) free(galois_split_w8[i]); - return -1; - } - } - - for (i = 0; i < 4; i += 3) { - ishift = i * 8; - for (j = ((i == 0) ? 0 : 1) ; j < 4; j++) { - jshift = j * 8; - table = galois_split_w8[i+j]; - index = 0; - for (p1 = 0; p1 < 256; p1++) { - p1elt = (p1 << ishift); - for (p2 = 0; p2 < 256; p2++) { - p2elt = (p2 << jshift); - table[index] = galois_shift_multiply(p1elt, p2elt, 32); - index++; - } - } - } - } - return 0; -} - -int galois_split_w8_multiply(int x, int y) -{ - int i, j, a, b, accumulator, i8, j8; - - accumulator = 0; - - i8 = 0; - for (i = 0; i < 4; i++) { - a = (((x >> i8) & 255) << 8); - j8 = 0; - for (j = 0; j < 4; j++) { - b = ((y >> j8) & 255); - accumulator ^= galois_split_w8[i+j][a|b]; - j8 += 8; - } - i8 += 8; - } - return accumulator; -} - -#endif - - diff --git a/test/Makefile.am b/test/Makefile.am index 1215713..5f9db05 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -17,10 +17,3 @@ liberasurecode_test_SOURCES = liberasurecode_test.c liberasurecode_test_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/erasurecode liberasurecode_test_LDFLAGS = $(top_srcdir)/src/liberasurecode.la -ldl -lpthread check_PROGRAMS += liberasurecode_test - -if GF_COMPLETE_INSTALLED - alg_sig_test_LDFLAGS += -lgf_complete - liberasurecode_test_LDFLAGS += -lgf_complete - test_xor_hd_code_LDFLAGS += -lgf_complete -endif - diff --git a/test/liberasurecode_test.c b/test/liberasurecode_test.c index 476e0c0..670e296 100644 --- a/test/liberasurecode_test.c +++ b/test/liberasurecode_test.c @@ -96,7 +96,7 @@ static int test_simple_encode_decode( assert(0 == rc); rc = liberasurecode_decode(desc, encoded_data, - 10, encoded_fragment_len, decoded_data, &decoded_data_len); + 10, encoded_fragment_len, &decoded_data, &decoded_data_len); assert(0 == rc); assert(decoded_data_len == orig_data_size); assert(memcmp(decoded_data, orig_data, orig_data_size) == 0); |