mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-02 04:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge seastar upstream

Browse Source 
Conflicts:
	test.py
This commit is contained in:
Avi Kivity
2015-06-28 19:43:28 +03:00
parent 9c7f1744b3 f687ec40a3
commit a7580f5dab
7 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README-DPDK.md
View File

@@ -4,11 +4,11 @@ Seastar and DPDK
Seastar uses the Data Plane Development Kit to drive NIC hardware directly. This
provides an enormous performance boost.
To enable DPDK, specify `--enable-dpdk` to `./configure.py`, and `--dpdk-pmd 1` as a
To enable DPDK, specify `--enable-dpdk` to `./configure.py`, and `--dpdk-pmd` as a
run-time parameter. This will use the DPDK package provided as a git submodule with the
seastar sources.
To use your own seld-compiled DPDK package, follow this procedure:
To use your own self-compiled DPDK package, follow this procedure:
1. Setup host to compile DPDK:
- Ubuntu

2
configure.py
View File

@@ -509,7 +509,7 @@ deps = {
'apps/httpd/httpd': ['apps/httpd/demo.json', 'apps/httpd/main.cc'] + http + libnet + core,
'apps/memcached/memcached': ['apps/memcached/memcache.cc'] + memcache_base,
'tests/memcached/test_ascii_parser': ['tests/memcached/test_ascii_parser.cc'] + memcache_base + boost_test_lib,
'tests/fileiotest': ['tests/fileiotest.cc'] + core,
'tests/fileiotest': ['tests/fileiotest.cc'] + core + boost_test_lib,
'tests/directory_test': ['tests/directory_test.cc'] + core,
'tests/linecount': ['tests/linecount.cc'] + core,
'tests/echotest': ['tests/echotest.cc'] + core + libnet,

5
core/file.hh
View File

@@ -104,9 +104,8 @@ public:
inline
std::unique_ptr<file_impl>
make_file_impl(int fd) {
struct stat st;
::fstat(fd, &st);
if (S_ISBLK(st.st_mode)) {
auto r = ::ioctl(fd, BLKGETSIZE);
if (r != -1) {
return std::unique_ptr<file_impl>(new blockdev_file_impl(fd));
} else {
return std::unique_ptr<file_impl>(new posix_file_impl(fd));

6
core/fstream.cc
View File

@@ -92,6 +92,10 @@ public:
return temporary_buffer<char>::aligned(file::dma_alignment, size);
}
virtual future<> put(temporary_buffer<char> buf) override {
// put() must usually be of chunks multiple of file::dma_alignment.
// Only the last part can have an unaligned length. If put() was
// called again with an unaligned pos, we have a bug in the caller.
assert(!(_pos & (file::dma_alignment - 1)));
bool truncate = false;
auto pos = _pos;
_pos += buf.size();
@@ -141,6 +145,6 @@ output_stream<char> make_file_output_stream(lw_shared_ptr<file> f, size_t buffer
}
output_stream<char> make_file_output_stream(lw_shared_ptr<file> f, file_output_stream_options options) {
return output_stream<char>(file_data_sink(std::move(f), options), options.buffer_size);
return output_stream<char>(file_data_sink(std::move(f), options), options.buffer_size, true);
}

7
core/shared_ptr.hh
View File

@@ -432,6 +432,13 @@ public:
T* get() const noexcept {
return _p;
}
long use_count() const noexcept {
if (_b) {
return _b->count;
} else {
return 0;
}
}
template <bool esft>
struct make_helper;

1
test.py
View File

@@ -34,6 +34,7 @@ boost_tests = [
'foreign_ptr_test',
'semaphore_test',
'shared_ptr_test',
'fileiotest',
'urchin/bytes_ostream_test',
'urchin/types_test',
'urchin/keys_test',

67
tests/fileiotest.cc
View File

@@ -16,12 +16,14 @@
* under the License.
*/
/*
* Copyright (C) 2014 Cloudius Systems, Ltd.
* Copyright (C) 2014-2015 Cloudius Systems, Ltd.
*/
#include <algorithm>
#include "tests/test-utils.hh"
#include "core/semaphore.hh"
#include "core/file.hh"
#include "core/reactor.hh"
#include "core/app-template.hh"
struct file_test {
file_test(file&& f) : f(std::move(f)) {}
@@ -30,41 +32,36 @@ struct file_test {
semaphore par = { 1000 };
};
int main(int ac, char** av) {
app_template app;
return app.run(ac, av, [&app] {
static constexpr auto max = 10000;
engine().open_file_dma("testfile.tmp", open_flags::rw | open_flags::create).then([] (file f) {
auto ft = new file_test{std::move(f)};
for (size_t i = 0; i < max; ++i) {
ft->par.wait().then([ft, i] {
auto wbuf = allocate_aligned_buffer<unsigned char>(4096, 4096);
std::fill(wbuf.get(), wbuf.get() + 4096, i);
auto wb = wbuf.get();
ft->f.dma_write(i * 4096, wb, 4096).then(
[ft, i, wbuf = std::move(wbuf)] (size_t ret) mutable {
assert(ret == 4096);
auto rbuf = allocate_aligned_buffer<unsigned char>(4096, 4096);
auto rb = rbuf.get();
ft->f.dma_read(i * 4096, rb, 4096).then(
[ft, i, rbuf = std::move(rbuf), wbuf = std::move(wbuf)] (size_t ret) mutable {
assert(ret == 4096);
bool eq = std::equal(rbuf.get(), rbuf.get() + 4096, wbuf.get());
assert(eq);
ft->sem.signal(1);
ft->par.signal();
});
SEASTAR_TEST_CASE(test1) {
// Note: this tests generates a file "testfile.tmp" with size 4096 * max (= 40 MB).
static constexpr auto max = 10000;
return open_file_dma("testfile.tmp", open_flags::rw | open_flags::create).then([] (file f) {
auto ft = new file_test{std::move(f)};
for (size_t i = 0; i < max; ++i) {
ft->par.wait().then([ft, i] {
auto wbuf = allocate_aligned_buffer<unsigned char>(4096, 4096);
std::fill(wbuf.get(), wbuf.get() + 4096, i);
auto wb = wbuf.get();
ft->f.dma_write(i * 4096, wb, 4096).then(
[ft, i, wbuf = std::move(wbuf)] (size_t ret) mutable {
BOOST_REQUIRE(ret == 4096);
auto rbuf = allocate_aligned_buffer<unsigned char>(4096, 4096);
auto rb = rbuf.get();
ft->f.dma_read(i * 4096, rb, 4096).then(
[ft, i, rbuf = std::move(rbuf), wbuf = std::move(wbuf)] (size_t ret) mutable {
BOOST_REQUIRE(ret == 4096);
BOOST_REQUIRE(std::equal(rbuf.get(), rbuf.get() + 4096, wbuf.get()));
ft->sem.signal(1);
ft->par.signal();
});
});
}
ft->sem.wait(max).then([ft] () mutable {
return ft->f.flush();
}).then([ft] () mutable {
std::cout << "done\n";
delete ft;
engine().exit(0);
});
}
return ft->sem.wait(max).then([ft] () mutable {
return ft->f.flush();
}).then([ft] () mutable {
std::cout << "done\n";
delete ft;
});
});
}