projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename struct rb_node into struct fio_rb_node
[fio.git]
/
t
/
dedupe.c
diff --git
a/t/dedupe.c
b/t/dedupe.c
index 030b4fc9d00f167b2d0eea363f03e73fdb469060..9a50821ed972921d926bb87ff8d2c9d7836f3561 100644
(file)
--- a/
t/dedupe.c
+++ b/
t/dedupe.c
@@
-14,17
+14,17
@@
#include <fcntl.h>
#include <string.h>
#include <fcntl.h>
#include <string.h>
-#include "../lib/rbtree.h"
#include "../flist.h"
#include "../log.h"
#include "../mutex.h"
#include "../smalloc.h"
#include "../minmax.h"
#include "../crc/md5.h"
#include "../flist.h"
#include "../log.h"
#include "../mutex.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 "../os/os.h"
#include "../gettime.h"
#include "../fio_time.h"
+#include "../lib/rbtree.h"
#include "../lib/bloom.h"
#include "debug.h"
#include "../lib/bloom.h"
#include "debug.h"
@@
-49,7
+49,7
@@
struct extent {
};
struct chunk {
};
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];
uint64_t count;
uint32_t hash[MD5_HASH_WORDS];
struct flist_head extent_list[0];
@@
-84,7
+84,7
@@
static uint64_t get_size(struct fio_file *f, struct stat *sb)
uint64_t ret;
if (S_ISBLK(sb->st_mode)) {
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");
if (blockdev_size(f, &bytes)) {
log_err("dedupe: failed getting bdev size\n");
@@
-194,7
+194,7
@@
static struct chunk *alloc_chunk(void)
static void insert_chunk(struct item *i)
{
static void insert_chunk(struct item *i)
{
- struct rb_node **p, *parent;
+ struct
fio_
rb_node **p, *parent;
struct chunk *c;
int diff;
struct chunk *c;
int diff;
@@
-294,8
+294,7
@@
static int do_work(struct worker_thread *thread, void *buf)
for (i = 0; i < nblocks; i++) {
void *thisptr = buf + (i * blocksize);
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++;
crc_buf(thisptr, items[i].hash);
offset += blocksize;
nitems++;
@@
-335,7
+334,7
@@
static void *thread_fn(void *data)
static void show_progress(struct worker_thread *threads, unsigned long total)
{
unsigned long last_nitems = 0;
static void show_progress(struct worker_thread *threads, unsigned long total)
{
unsigned long last_nitems = 0;
- struct time
val
last_tv;
+ struct time
spec
last_tv;
fio_gettime(&last_tv, NULL);
fio_gettime(&last_tv, NULL);
@@
-364,7
+363,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);
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 (%luK
i
B/sec)\r", perc, this_items);
last_nitems = nitems;
fio_gettime(&last_tv, NULL);
} else
last_nitems = nitems;
fio_gettime(&last_tv, NULL);
} else
@@
-388,10
+387,8
@@
static int run_dedupe_threads(struct fio_file *f, uint64_t dev_size,
threads = malloc(num_threads * sizeof(struct worker_thread));
for (i = 0; i < num_threads; i++) {
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].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) {
err = pthread_create(&threads[i].thread, NULL, thread_fn, &threads[i]);
if (err) {
@@
-500,7
+497,7
@@
static void show_stat(uint64_t nextents, uint64_t nchunks)
static void iter_rb_tree(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;
*nchunks = *nextents = 0;
@@
-540,6
+537,7
@@
int main(int argc, char *argv[])
uint64_t nextents = 0, nchunks = 0;
int c, ret;
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) {
debug_init();
while ((c = getopt(argc, argv, "b:t:d:o:c:p:B:")) != -1) {