X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=t%2Fdedupe.c;h=8b659c76c71caca57be3e80c9b4ed94077fb79a8;hb=864314464e2772a9885da34ea041f130073affe9;hp=c3b837f7b698cdedd027f20be12e085ffe21faa1;hpb=84e893fd54a0895b9eadd8b4c62243faf19c9305;p=fio.git diff --git a/t/dedupe.c b/t/dedupe.c index c3b837f7..8b659c76 100644 --- a/t/dedupe.c +++ b/t/dedupe.c @@ -3,24 +3,20 @@ * just scans the filename for extents of the given size, checksums them, * and orders them up. */ +#include +#include #include -#include +#include #include -#include -#include -#include #include -#include -#include -#include +#include "../fio.h" #include "../flist.h" #include "../log.h" -#include "../mutex.h" +#include "../fio_sem.h" #include "../smalloc.h" #include "../minmax.h" #include "../crc/md5.h" -#include "../lib/memalign.h" #include "../os/os.h" #include "../gettime.h" #include "../fio_time.h" @@ -49,7 +45,7 @@ struct extent { }; struct chunk { - struct rb_node rb_node; + struct fio_rb_node rb_node; uint64_t count; uint32_t hash[MD5_HASH_WORDS]; struct flist_head extent_list[0]; @@ -62,7 +58,7 @@ struct item { static struct rb_root rb_root; static struct bloom *bloom; -static struct fio_mutex *rb_lock; +static struct fio_sem *rb_lock; static unsigned int blocksize = 4096; static unsigned int num_threads; @@ -75,7 +71,7 @@ static unsigned int use_bloom = 1; static uint64_t total_size; static uint64_t cur_offset; -static struct fio_mutex *size_lock; +static struct fio_sem *size_lock; static struct fio_file file; @@ -102,7 +98,7 @@ static int get_work(uint64_t *offset, uint64_t *size) uint64_t this_chunk; int ret = 1; - fio_mutex_down(size_lock); + fio_sem_down(size_lock); if (cur_offset < total_size) { *offset = cur_offset; @@ -112,7 +108,7 @@ static int get_work(uint64_t *offset, uint64_t *size) ret = 0; } - fio_mutex_up(size_lock); + fio_sem_up(size_lock); return ret; } @@ -162,8 +158,8 @@ static int col_check(struct chunk *c, struct item *i) char *cbuf, *ibuf; int ret = 1; - cbuf = fio_memalign(blocksize, blocksize); - ibuf = fio_memalign(blocksize, blocksize); + cbuf = fio_memalign(blocksize, blocksize, false); + ibuf = fio_memalign(blocksize, blocksize, false); e = flist_entry(c->extent_list[0].next, struct extent, list); if (read_block(file.fd, cbuf, e->offset)) @@ -174,8 +170,8 @@ static int col_check(struct chunk *c, struct item *i) ret = memcmp(ibuf, cbuf, blocksize); out: - fio_memfree(cbuf, blocksize); - fio_memfree(ibuf, blocksize); + fio_memfree(cbuf, blocksize, false); + fio_memfree(ibuf, blocksize, false); return ret; } @@ -194,7 +190,7 @@ static struct chunk *alloc_chunk(void) static void insert_chunk(struct item *i) { - struct rb_node **p, *parent; + struct fio_rb_node **p, *parent; struct chunk *c; int diff; @@ -215,9 +211,9 @@ static void insert_chunk(struct item *i) if (!collision_check) goto add; - fio_mutex_up(rb_lock); + fio_sem_up(rb_lock); ret = col_check(c, i); - fio_mutex_down(rb_lock); + fio_sem_down(rb_lock); if (!ret) goto add; @@ -241,7 +237,7 @@ static void insert_chunks(struct item *items, unsigned int nitems, { int i; - fio_mutex_down(rb_lock); + fio_sem_down(rb_lock); for (i = 0; i < nitems; i++) { if (bloom) { @@ -255,7 +251,7 @@ static void insert_chunks(struct item *items, unsigned int nitems, insert_chunk(&items[i]); } - fio_mutex_up(rb_lock); + fio_sem_up(rb_lock); } static void crc_buf(void *buf, uint32_t *hash) @@ -313,7 +309,7 @@ static void *thread_fn(void *data) struct worker_thread *thread = data; void *buf; - buf = fio_memalign(blocksize, chunk_size); + buf = fio_memalign(blocksize, chunk_size, false); do { if (get_work(&thread->cur_offset, &thread->size)) { @@ -327,7 +323,7 @@ static void *thread_fn(void *data) } while (1); thread->done = 1; - fio_memfree(buf, chunk_size); + fio_memfree(buf, chunk_size, false); return NULL; } @@ -383,7 +379,7 @@ static int run_dedupe_threads(struct fio_file *f, uint64_t dev_size, total_size = dev_size; total_items = dev_size / blocksize; cur_offset = 0; - size_lock = fio_mutex_init(FIO_MUTEX_UNLOCKED); + size_lock = fio_sem_init(FIO_SEM_UNLOCKED); threads = malloc(num_threads * sizeof(struct worker_thread)); for (i = 0; i < num_threads; i++) { @@ -414,7 +410,7 @@ static int run_dedupe_threads(struct fio_file *f, uint64_t dev_size, *nextents = nitems; *nchunks = nitems - *nchunks; - fio_mutex_remove(size_lock); + fio_sem_remove(size_lock); free(threads); return err; } @@ -477,11 +473,14 @@ static void show_chunk(struct chunk *c) } } -static void show_stat(uint64_t nextents, uint64_t nchunks) +static void show_stat(uint64_t nextents, uint64_t nchunks, uint64_t ndupextents) { double perc, ratio; - printf("Extents=%lu, Unique extents=%lu\n", (unsigned long) nextents, (unsigned long) nchunks); + printf("Extents=%lu, Unique extents=%lu", (unsigned long) nextents, (unsigned long) nchunks); + if (!bloom) + printf(" Duplicated extents=%lu", (unsigned long) ndupextents); + printf("\n"); if (nchunks) { ratio = (double) nextents / (double) nchunks; @@ -489,17 +488,20 @@ static void show_stat(uint64_t nextents, uint64_t nchunks) } else printf("De-dupe ratio: 1:infinite\n"); + if (ndupextents) + printf("De-dupe working set at least: %3.2f%%\n", 100.0 * (double) ndupextents / (double) nextents); + perc = 1.00 - ((double) nchunks / (double) nextents); perc *= 100.0; printf("Fio setting: dedupe_percentage=%u\n", (int) (perc + 0.50)); } -static void iter_rb_tree(uint64_t *nextents, uint64_t *nchunks) +static void iter_rb_tree(uint64_t *nextents, uint64_t *nchunks, uint64_t *ndupextents) { - struct rb_node *n; + struct fio_rb_node *n; - *nchunks = *nextents = 0; + *nchunks = *nextents = *ndupextents = 0; n = rb_first(&rb_root); if (!n) @@ -511,6 +513,7 @@ static void iter_rb_tree(uint64_t *nextents, uint64_t *nchunks) c = rb_entry(n, struct chunk, rb_node); (*nchunks)++; *nextents += c->count; + *ndupextents += (c->count > 1); if (dump_output) show_chunk(c); @@ -534,7 +537,7 @@ static int usage(char *argv[]) int main(int argc, char *argv[]) { - uint64_t nextents = 0, nchunks = 0; + uint64_t nextents = 0, nchunks = 0, ndupextents = 0; int c, ret; arch_init(argv); @@ -581,18 +584,18 @@ int main(int argc, char *argv[]) sinit(); rb_root = RB_ROOT; - rb_lock = fio_mutex_init(FIO_MUTEX_UNLOCKED); + rb_lock = fio_sem_init(FIO_SEM_UNLOCKED); ret = dedupe_check(argv[optind], &nextents, &nchunks); if (!ret) { if (!bloom) - iter_rb_tree(&nextents, &nchunks); + iter_rb_tree(&nextents, &nchunks, &ndupextents); - show_stat(nextents, nchunks); + show_stat(nextents, nchunks, ndupextents); } - fio_mutex_remove(rb_lock); + fio_sem_remove(rb_lock); if (bloom) bloom_free(bloom); scleanup();