huynp911
/
vitastor
forked from vitalif/vitastor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compile fio engine

blocking-uring-test
Vitaliy Filippov 2019-11-26 00:02:54 +03:00
parent 3e46728321
commit a7dc759f74
4 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,13 +1,15 @@
BLOCKSTORE_OBJS := allocator.o blockstore.o blockstore_init.o blockstore_open.o blockstore_journal.o blockstore_read.o \ BLOCKSTORE_OBJS := allocator.o blockstore.o blockstore_init.o blockstore_open.o blockstore_journal.o blockstore_read.o \
blockstore_write.o blockstore_sync.o blockstore_stable.o blockstore_flush.o crc32c.o ringloop.o blockstore_write.o blockstore_sync.o blockstore_stable.o blockstore_flush.o crc32c.o ringloop.o
all: $(BLOCKSTORE_OBJS) test test_blockstore all: $(BLOCKSTORE_OBJS) test test_blockstore libfio_blockstore.so
clean: clean:
rm -f *.o rm -f *.o
crc32c.o: crc32c.c crc32c.o: crc32c.c
g++ -c -o $@ $< g++ -fPIC -c -o $@ $<
%.o: %.cpp allocator.h blockstore_flush.h blockstore.h blockstore_init.h blockstore_journal.h crc32c.h ringloop.h xor.h %.o: %.cpp allocator.h blockstore_flush.h blockstore.h blockstore_init.h blockstore_journal.h crc32c.h ringloop.h xor.h
g++ -g -Wall -Wno-sign-compare -Wno-parentheses -c -o $@ $< g++ -g -Wall -Wno-sign-compare -Wno-parentheses -fPIC -c -o $@ $<
test: test.cpp test: test.cpp
g++ -g -O3 -o test -luring test.cpp g++ -g -O3 -o test -luring test.cpp
test_blockstore: $(BLOCKSTORE_OBJS) test_blockstore.cpp test_blockstore: $(BLOCKSTORE_OBJS) test_blockstore.cpp
g++ -g -o test_blockstore -luring test_blockstore.cpp $(BLOCKSTORE_OBJS) g++ -g -o test_blockstore -luring test_blockstore.cpp $(BLOCKSTORE_OBJS)
libfio_blockstore.so: fio_engine.cpp $(BLOCKSTORE_OBJS)
g++ -Wno-pointer-arith -fPIC -shared -luring -o libfio_blockstore.so fio_engine.cpp $(BLOCKSTORE_OBJS)

8
blockstore.h
View File

@ -212,7 +212,7 @@ struct blockstore_operation
uint32_t offset; uint32_t offset;
// For stabilize requests: buf contains <len> obj_ver_id's to stabilize // For stabilize requests: buf contains <len> obj_ver_id's to stabilize
uint32_t len; uint32_t len;
uint8_t *buf; // FIXME: void* void *buf;
int retval; int retval;
// FIXME: Move internal fields somewhere // FIXME: Move internal fields somewhere
@ -253,9 +253,7 @@ class blockstore
std::map<obj_ver_id, dirty_entry> dirty_db; std::map<obj_ver_id, dirty_entry> dirty_db;
std::list<blockstore_operation*> submit_queue; // FIXME: funny thing is that vector is better here std::list<blockstore_operation*> submit_queue; // FIXME: funny thing is that vector is better here
std::vector<obj_ver_id> unsynced_big_writes, unsynced_small_writes; std::vector<obj_ver_id> unsynced_big_writes, unsynced_small_writes;
std::map<object_id, uint64_t> unstable_writes;
std::list<blockstore_operation*> in_progress_syncs; // ...and probably here, too std::list<blockstore_operation*> in_progress_syncs; // ...and probably here, too
uint32_t block_order, block_size;
uint64_t block_count; uint64_t block_count;
allocator *data_alloc; allocator *data_alloc;
uint8_t *zero_object; uint8_t *zero_object;
@ -340,4 +338,8 @@ public:
// Submission // Submission
void enqueue_op(blockstore_operation *op); void enqueue_op(blockstore_operation *op);
// FIXME public morozov
std::map<object_id, uint64_t> unstable_writes;
uint32_t block_order, block_size;
}; };

4
blockstore_read.cpp
View File

@ -15,12 +15,12 @@ int blockstore::fulfill_read_push(blockstore_operation *op, uint64_t &fulfilled,
else if (IS_DELETE(item_state)) else if (IS_DELETE(item_state))
{ {
// item is unallocated - return zeroes // item is unallocated - return zeroes
memset(op->buf + cur_start - op->offset, 0, cur_end - cur_start); memset((uint8_t*)op->buf + cur_start - op->offset, 0, cur_end - cur_start);
return 1; return 1;
} }
BS_SUBMIT_GET_SQE(sqe, data); BS_SUBMIT_GET_SQE(sqe, data);
data->iov = (struct iovec){ data->iov = (struct iovec){
op->buf + cur_start - op->offset, (uint8_t*)op->buf + cur_start - op->offset,
cur_end - cur_start cur_end - cur_start
}; };
// FIXME: use simple std::vector instead of map for read_vec // FIXME: use simple std::vector instead of map for read_vec

58
fio_engine.cpp
View File

@ -1,7 +1,11 @@
// FIO engine to test Blockstore // FIO engine to test Blockstore
#include "blockstore.h" #include "blockstore.h"
#include "fio.h" extern "C" {
#define CONFIG_PWRITEV2
#include "fio/fio.h"
#include "fio/optgroup.h"
}
struct bs_data struct bs_data
{ {
@ -20,11 +24,11 @@ static struct fio_option options[] = {
{ {
.name = "data_device", .name = "data_device",
.lname = "Data device", .lname = "Data device",
.type = FIO_OPT_STR_STORE,
.off1 = offsetof(struct bs_options, data_device),
.help = "Name of the data device", .help = "Name of the data device",
.category = FIO_OPT_C_ENGINE, .category = FIO_OPT_C_ENGINE,
.group = FIO_OPT_G_FILENAME, .group = FIO_OPT_G_FILENAME,
.type = FIO_OPT_STR_STORE,
.off1 = offsetof(struct bs_options, data_device),
}, },
{ {
.name = NULL, .name = NULL,
@ -34,7 +38,7 @@ static struct fio_option options[] = {
static int bs_setup(struct thread_data *td) static int bs_setup(struct thread_data *td)
{ {
bs_data *bsd; bs_data *bsd;
bs_options *o = td->eo; bs_options *o = (bs_options*)td->eo;
fio_file *f; fio_file *f;
int r; int r;
//int64_t size; //int64_t size;
@ -62,20 +66,20 @@ static int bs_setup(struct thread_data *td)
static void bs_cleanup(struct thread_data *td) static void bs_cleanup(struct thread_data *td)
{ {
bs_data *bsd = td->io_ops_data; bs_data *bsd = (bs_data*)td->io_ops_data;
if (bsd) if (bsd)
{ {
free(bs_data); free(bsd);
} }
} }
/* Connect to the server from each thread. */ /* Connect to the server from each thread. */
static int bs_init(struct thread_data *td) static int bs_init(struct thread_data *td)
{ {
struct bs_options *o = td->eo; bs_options *o = (bs_options*)td->eo;
struct bs_data *bs_data = td->io_ops_data; bs_data *bsd = (bs_data*)td->io_ops_data;
int r; int r;
spp::sparse_hash_map<std::string, std::string> config; spp::sparse_hash_map<std::string, std::string> config;
@ -83,7 +87,7 @@ static int bs_init(struct thread_data *td)
config["journal_device"] = "./test_journal.bin"; config["journal_device"] = "./test_journal.bin";
config["data_device"] = "./test_data.bin"; config["data_device"] = "./test_data.bin";
bsd->ringloop = new ring_loop_t(512); bsd->ringloop = new ring_loop_t(512);
bsd->bs = new blockstore(config, ringloop); bsd->bs = new blockstore(config, bsd->ringloop);
while (!bsd->bs->is_started()) while (!bsd->bs->is_started())
{ {
bsd->ringloop->loop(); bsd->ringloop->loop();
@ -96,14 +100,14 @@ static int bs_init(struct thread_data *td)
/* Begin read or write request. */ /* Begin read or write request. */
static enum fio_q_status bs_queue(struct thread_data *td, struct io_u *io_u) static enum fio_q_status bs_queue(struct thread_data *td, struct io_u *io_u)
{ {
struct bs_data *bsd = td->io_ops_data; bs_data *bsd = (bs_data*)td->io_ops_data;
fio_ro_check(td, io_u); fio_ro_check(td, io_u);
io_u->engine_data = bsd; io_u->engine_data = bsd;
if (io_u->ddir == DDIR_WRITE || io_u->ddir == DDIR_READ) if (io_u->ddir == DDIR_WRITE || io_u->ddir == DDIR_READ)
assert(io_u->xfer_buflen <= bsd->block_size); assert(io_u->xfer_buflen <= bsd->bs->block_size);
blockstore_operation *op = new blockstore_operation; blockstore_operation *op = new blockstore_operation;
@ -114,9 +118,9 @@ static enum fio_q_status bs_queue(struct thread_data *td, struct io_u *io_u)
op->buf = io_u->xfer_buf; op->buf = io_u->xfer_buf;
op->oid = { op->oid = {
.inode = 1, .inode = 1,
.stripe = io_u->offset >> bsd->block_order, .stripe = io_u->offset >> bsd->bs->block_order,
}; };
op->offset = io_u->offset % bsd->block_size; op->offset = io_u->offset % bsd->bs->block_size;
op->len = io_u->xfer_buflen; op->len = io_u->xfer_buflen;
op->callback = [&](blockstore_operation *op) op->callback = [&](blockstore_operation *op)
{ {
@ -129,9 +133,9 @@ static enum fio_q_status bs_queue(struct thread_data *td, struct io_u *io_u)
op->buf = io_u->xfer_buf; op->buf = io_u->xfer_buf;
op->oid = { op->oid = {
.inode = 1, .inode = 1,
.stripe = io_u->offset >> bsd->block_order, .stripe = io_u->offset >> bsd->bs->block_order,
}; };
op->offset = io_u->offset % bsd->block_size; op->offset = io_u->offset % bsd->bs->block_size;
op->len = io_u->xfer_buflen; op->len = io_u->xfer_buflen;
op->callback = [&](blockstore_operation *op) op->callback = [&](blockstore_operation *op)
{ {
@ -147,11 +151,12 @@ static enum fio_q_status bs_queue(struct thread_data *td, struct io_u *io_u)
{ {
op->flags = OP_STABLE; op->flags = OP_STABLE;
op->len = bsd->bs->unstable_writes.size(); op->len = bsd->bs->unstable_writes.size();
op->buf = new obj_ver_id[op->len]; obj_ver_id *vers = new obj_ver_id[op->len];
op->buf = vers;
int i = 0; int i = 0;
for (auto it = bsd->bs->unstable_writes.begin(); it != bsd->bs->unstable_writes.end(); it++, i++) for (auto it = bsd->bs->unstable_writes.begin(); it != bsd->bs->unstable_writes.end(); it++, i++)
{ {
op->buf[i] = { vers[i] = {
.oid = it->first, .oid = it->first,
.version = it->second, .version = it->second,
}; };
@ -160,7 +165,8 @@ static enum fio_q_status bs_queue(struct thread_data *td, struct io_u *io_u)
op->callback = [&](blockstore_operation *op) op->callback = [&](blockstore_operation *op)
{ {
bsd->completed.push_back(io_u); bsd->completed.push_back(io_u);
delete[] op->buf; obj_ver_id *vers = (obj_ver_id*)op->buf;
delete[] vers;
delete op; delete op;
}; };
} }
@ -184,7 +190,7 @@ static enum fio_q_status bs_queue(struct thread_data *td, struct io_u *io_u)
static int bs_getevents(struct thread_data *td, unsigned int min, unsigned int max, const struct timespec *t) static int bs_getevents(struct thread_data *td, unsigned int min, unsigned int max, const struct timespec *t)
{ {
struct bs_data *bsd = td->io_ops_data; bs_data *bsd = (bs_data*)td->io_ops_data;
// FIXME timeout // FIXME timeout
while (bsd->completed.size() < min) while (bsd->completed.size() < min)
{ {
@ -195,7 +201,7 @@ static int bs_getevents(struct thread_data *td, unsigned int min, unsigned int m
static struct io_u *bs_event(struct thread_data *td, int event) static struct io_u *bs_event(struct thread_data *td, int event)
{ {
struct bs_data *bsd = td->io_ops_data; bs_data *bsd = (bs_data*)td->io_ops_data;
if (bsd->completed.size() == 0) if (bsd->completed.size() == 0)
return NULL; return NULL;
/* FIXME We ignore the event number and assume fio calls us exactly once for [0..nr_events-1] */ /* FIXME We ignore the event number and assume fio calls us exactly once for [0..nr_events-1] */
@ -224,24 +230,20 @@ static int bs_invalidate(struct thread_data *td, struct fio_file *f)
return 0; return 0;
} }
static struct ioengine_ops ioengine = { struct ioengine_ops ioengine = {
.name = "microceph_blockstore", .name = "microceph_blockstore",
.version = FIO_IOOPS_VERSION, .version = FIO_IOOPS_VERSION,
.options = options,
.option_struct_size = sizeof(struct bs_options),
.flags = FIO_MEMALIGN | FIO_DISKLESSIO | FIO_NOEXTEND, .flags = FIO_MEMALIGN | FIO_DISKLESSIO | FIO_NOEXTEND,
.setup = bs_setup, .setup = bs_setup,
.init = bs_init, .init = bs_init,
.cleanup = bs_cleanup,
.queue = bs_queue, .queue = bs_queue,
.getevents = bs_getevents, .getevents = bs_getevents,
.event = bs_event, .event = bs_event,
.io_u_init = bs_io_u_init, .cleanup = bs_cleanup,
.io_u_free = bs_io_u_free,
.open_file = bs_open_file, .open_file = bs_open_file,
.invalidate = bs_invalidate, .invalidate = bs_invalidate,
.io_u_init = bs_io_u_init,
.io_u_free = bs_io_u_free,
}; };
static void fio_init fio_bs_register(void) static void fio_init fio_bs_register(void)