projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-cflags' of https://github.com/Hi-Angel/fio
[fio.git]
/
t
/
dedupe.c
diff --git
a/t/dedupe.c
b/t/dedupe.c
index 37120e1895063e7270c6e48382ad661f33395fc3..68d31f19bd7b6a028975ece96918e6f9a014c8c0 100644
(file)
--- a/
t/dedupe.c
+++ b/
t/dedupe.c
@@
-10,13
+10,13
@@
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/stat.h>
+#include "../fio.h"
#include "../flist.h"
#include "../log.h"
#include "../fio_sem.h"
#include "../smalloc.h"
#include "../minmax.h"
#include "../crc/md5.h"
#include "../flist.h"
#include "../log.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"
#include "../os/os.h"
#include "../gettime.h"
#include "../fio_time.h"
@@
-158,8
+158,8
@@
static int col_check(struct chunk *c, struct item *i)
char *cbuf, *ibuf;
int ret = 1;
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))
e = flist_entry(c->extent_list[0].next, struct extent, list);
if (read_block(file.fd, cbuf, e->offset))
@@
-170,8
+170,8
@@
static int col_check(struct chunk *c, struct item *i)
ret = memcmp(ibuf, cbuf, blocksize);
out:
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;
}
return ret;
}
@@
-309,7
+309,7
@@
static void *thread_fn(void *data)
struct worker_thread *thread = data;
void *buf;
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)) {
do {
if (get_work(&thread->cur_offset, &thread->size)) {
@@
-323,7
+323,7
@@
static void *thread_fn(void *data)
} while (1);
thread->done = 1;
} while (1);
thread->done = 1;
- fio_memfree(buf, chunk_size);
+ fio_memfree(buf, chunk_size
, false
);
return NULL;
}
return NULL;
}