diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libostree/bupsplit.c | 38 | ||||
-rw-r--r-- | src/libostree/bupsplit.h | 7 |
2 files changed, 7 insertions, 38 deletions
diff --git a/src/libostree/bupsplit.c b/src/libostree/bupsplit.c index 067b2e96..79207a65 100644 --- a/src/libostree/bupsplit.c +++ b/src/libostree/bupsplit.c @@ -80,7 +80,8 @@ static uint32_t rollsum_digest(Rollsum *r) } -static uint32_t rollsum_sum(uint8_t *buf, size_t ofs, size_t len) +uint32_t +bupsplit_sum(uint8_t *buf, size_t ofs, size_t len) { size_t count; Rollsum r; @@ -115,38 +116,3 @@ int bupsplit_find_ofs(const unsigned char *buf, int len, int *bits) } return 0; } - - -#ifndef BUP_NO_SELFTEST -#define BUP_SELFTEST_SIZE 100000 - -int bupsplit_selftest() -{ - uint8_t *buf = malloc(BUP_SELFTEST_SIZE); - uint32_t sum1a, sum1b, sum2a, sum2b, sum3a, sum3b; - unsigned count; - - srandom(1); - for (count = 0; count < BUP_SELFTEST_SIZE; count++) - buf[count] = random(); - - sum1a = rollsum_sum(buf, 0, BUP_SELFTEST_SIZE); - sum1b = rollsum_sum(buf, 1, BUP_SELFTEST_SIZE); - sum2a = rollsum_sum(buf, BUP_SELFTEST_SIZE - BUP_WINDOWSIZE*5/2, - BUP_SELFTEST_SIZE - BUP_WINDOWSIZE); - sum2b = rollsum_sum(buf, 0, BUP_SELFTEST_SIZE - BUP_WINDOWSIZE); - sum3a = rollsum_sum(buf, 0, BUP_WINDOWSIZE+3); - sum3b = rollsum_sum(buf, 3, BUP_WINDOWSIZE+3); - - fprintf(stderr, "sum1a = 0x%08x\n", sum1a); - fprintf(stderr, "sum1b = 0x%08x\n", sum1b); - fprintf(stderr, "sum2a = 0x%08x\n", sum2a); - fprintf(stderr, "sum2b = 0x%08x\n", sum2b); - fprintf(stderr, "sum3a = 0x%08x\n", sum3a); - fprintf(stderr, "sum3b = 0x%08x\n", sum3b); - - free(buf); - return sum1a!=sum1b || sum2a!=sum2b || sum3a!=sum3b; -} - -#endif // !BUP_NO_SELFTEST diff --git a/src/libostree/bupsplit.h b/src/libostree/bupsplit.h index e37a56ab..f770ee58 100644 --- a/src/libostree/bupsplit.h +++ b/src/libostree/bupsplit.h @@ -30,6 +30,9 @@ #ifndef __BUPSPLIT_H #define __BUPSPLIT_H +#include <stdint.h> +#include <sys/types.h> + #define BUP_BLOBBITS (13) #define BUP_BLOBSIZE (1<<BUP_BLOBBITS) #define BUP_WINDOWBITS (7) @@ -38,9 +41,9 @@ #ifdef __cplusplus extern "C" { #endif - + +uint32_t bupsplit_sum(uint8_t *buf, size_t ofs, size_t len); int bupsplit_find_ofs(const unsigned char *buf, int len, int *bits); -int bupsplit_selftest(void); #ifdef __cplusplus } |