X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=t%2Fdedupe.c;h=2ef8dc539809884cc0372597ef1a260385ee9165;hp=030b4fc9d00f167b2d0eea363f03e73fdb469060;hb=de5ed0e4d398bc9d4576f9b2b82d7686989c27e1;hpb=a0ae50a6c23daa132fefde214d024d1932997259 diff --git a/t/dedupe.c b/t/dedupe.c index 030b4fc9..2ef8dc53 100644 --- a/t/dedupe.c +++ b/t/dedupe.c @@ -3,28 +3,24 @@ * 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 "../lib/rbtree.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 "../memalign.h" +#include "../lib/memalign.h" #include "../os/os.h" #include "../gettime.h" #include "../fio_time.h" +#include "../lib/rbtree.h" #include "../lib/bloom.h" #include "debug.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; @@ -84,7 +80,7 @@ static uint64_t get_size(struct fio_file *f, struct stat *sb) uint64_t ret; if (S_ISBLK(sb->st_mode)) { - unsigned long long bytes; + unsigned long long bytes = 0; if (blockdev_size(f, &bytes)) { log_err("dedupe: failed getting bdev size\n"); @@ -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) @@ -294,8 +290,7 @@ static int do_work(struct worker_thread *thread, void *buf) for (i = 0; i < nblocks; i++) { void *thisptr = buf + (i * blocksize); - if (items) - items[i].offset = offset; + items[i].offset = offset; crc_buf(thisptr, items[i].hash); offset += blocksize; nitems++; @@ -314,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)) { @@ -328,14 +323,14 @@ static void *thread_fn(void *data) } while (1); thread->done = 1; - fio_memfree(buf, chunk_size); + fio_memfree(buf, chunk_size, false); return NULL; } static void show_progress(struct worker_thread *threads, unsigned long total) { unsigned long last_nitems = 0; - struct timeval last_tv; + struct timespec last_tv; fio_gettime(&last_tv, NULL); @@ -364,7 +359,7 @@ static void show_progress(struct worker_thread *threads, unsigned long total) tdiff = mtime_since_now(&last_tv); if (tdiff) { this_items = (this_items * 1000) / (tdiff * 1024); - printf("%3.2f%% done (%luKB/sec)\r", perc, this_items); + printf("%3.2f%% done (%luKiB/sec)\r", perc, this_items); last_nitems = nitems; fio_gettime(&last_tv, NULL); } else @@ -384,14 +379,12 @@ 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++) { + memset(&threads[i], 0, sizeof(struct worker_thread)); threads[i].fd = f->fd; - threads[i].items = 0; - threads[i].err = 0; - threads[i].done = 0; err = pthread_create(&threads[i].thread, NULL, thread_fn, &threads[i]); if (err) { @@ -417,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; } @@ -500,7 +493,7 @@ static void show_stat(uint64_t nextents, uint64_t nchunks) static void iter_rb_tree(uint64_t *nextents, uint64_t *nchunks) { - struct rb_node *n; + struct fio_rb_node *n; *nchunks = *nextents = 0; @@ -540,6 +533,7 @@ int main(int argc, char *argv[]) uint64_t nextents = 0, nchunks = 0; int c, ret; + arch_init(argv); debug_init(); while ((c = getopt(argc, argv, "b:t:d:o:c:p:B:")) != -1) { @@ -583,7 +577,7 @@ 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); @@ -594,7 +588,7 @@ int main(int argc, char *argv[]) show_stat(nextents, nchunks); } - fio_mutex_remove(rb_lock); + fio_sem_remove(rb_lock); if (bloom) bloom_free(bloom); scleanup();