thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed iotests [#METR-2807].

Browse Source
This commit is contained in:
Alexey Milovidov 2015-02-02 02:48:23 +03:00
parent 7f0654cabb
commit 91b7c5be21
3 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/iotest/iotest.cpp
View File

@ -63,7 +63,6 @@ void thread(int fd, int mode, size_t min_offset, size_t max_offset, size_t block
try
{
AlignedBuffer direct_buf(block_size);
std::vector<char> simple_buf(block_size);
char * buf;
@ -87,15 +86,6 @@ void thread(int fd, int mode, size_t min_offset, size_t max_offset, size_t block
lrand48_r(&rand_data, &rand_result2);
lrand48_r(&rand_data, &rand_result3);
for (size_t j = 0; j + 3 < block_size; j += 3)
{
long r;
lrand48_r(&rand_data, &r);
buf[j ] = static_cast<char>((r >> 0) & 255);
buf[j + 1] = static_cast<char>((r >> 8) & 255);
buf[j + 2] = static_cast<char>((r >> 16) & 255);
}
size_t rand_result = rand_result1 ^ (rand_result2 << 22) ^ (rand_result3 << 43);
size_t offset;
if ((mode & MODE_DIRECT) || (mode & MODE_ALIGNED))

9
utils/iotest/iotest_aio.cpp
View File

@ -156,15 +156,6 @@ void thread(int fd, int mode, size_t min_offset, size_t max_offset, size_t block
char * buf = buffers[i].data;
for (size_t j = 0; j + 3 < block_size; j += 3)
{
long r;
lrand48_r(&rand_data, &r);
buf[j ] = static_cast<char>((r >> 0) & 255);
buf[j + 1] = static_cast<char>((r >> 8) & 255);
buf[j + 2] = static_cast<char>((r >> 16) & 255);
}
long rand_result1 = 0;
long rand_result2 = 0;
long rand_result3 = 0;

49
utils/iotest/iotest_nonblock.cpp
View File

@ -40,27 +40,27 @@ int mainImpl(int argc, char ** argv)
size_t block_size = 0;
size_t descriptors = 0;
size_t count = 0;
if (argc != 8)
{
std::cerr << "Usage: " << argv[0] << " file_name r|w min_offset max_offset block_size descriptors count" << std::endl;
return 1;
}
file_name = argv[1];
min_offset = Poco::NumberParser::parseUnsigned64(argv[3]);
max_offset = Poco::NumberParser::parseUnsigned64(argv[4]);
block_size = Poco::NumberParser::parseUnsigned64(argv[5]);
descriptors = Poco::NumberParser::parseUnsigned(argv[6]);
count = Poco::NumberParser::parseUnsigned(argv[7]);
if (!strcmp(argv[2], "r"))
mode = MODE_READ;
else if (!strcmp(argv[2], "w"))
mode = MODE_WRITE;
else
throw Poco::Exception("Invalid mode");
std::vector<int> fds(descriptors);
for (size_t i = 0; i < descriptors; ++i)
{
@ -68,26 +68,26 @@ int mainImpl(int argc, char ** argv)
if (-1 == fds[i])
throwFromErrno("Cannot open file");
}
std::vector<char> buf(block_size);
drand48_data rand_data;
timespec times;
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &times);
srand48_r(times.tv_nsec, &rand_data);
Stopwatch watch;
std::vector<pollfd> polls(descriptors);
for (size_t i = 0; i < descriptors; ++i)
{
polls[i].fd = fds[i];
polls[i].events = (mode == MODE_READ) ? POLLIN : POLLOUT;
polls[i].revents = 0;
}
size_t ops = 0;
while (ops < count)
{
@ -97,32 +97,23 @@ int mainImpl(int argc, char ** argv)
{
if (!polls[i].revents)
continue;
if (polls[i].revents != polls[i].events)
throw Poco::Exception("revents indicates error");
polls[i].revents = 0;
++ops;
long rand_result1 = 0;
long rand_result2 = 0;
long rand_result3 = 0;
lrand48_r(&rand_data, &rand_result1);
lrand48_r(&rand_data, &rand_result2);
lrand48_r(&rand_data, &rand_result3);
for (size_t j = 0; j + 3 < block_size; j += 3)
{
long r;
lrand48_r(&rand_data, &r);
buf[j ] = static_cast<char>((r >> 0) & 255);
buf[j + 1] = static_cast<char>((r >> 8) & 255);
buf[j + 2] = static_cast<char>((r >> 16) & 255);
}
size_t rand_result = rand_result1 ^ (rand_result2 << 22) ^ (rand_result3 << 43);
size_t offset;
offset = min_offset + rand_result % ((max_offset - min_offset) / block_size) * block_size;
if (mode == MODE_READ)
{
if (static_cast<int>(block_size) != pread(fds[i], &buf[0], block_size, offset))
@ -135,27 +126,27 @@ int mainImpl(int argc, char ** argv)
}
}
}
for (size_t i = 0; i < descriptors; ++i)
{
if (fsync(fds[i]))
throwFromErrno("Cannot fsync");
}
watch.stop();
for (size_t i = 0; i < descriptors; ++i)
{
if (0 != close(fds[i]))
throwFromErrno("Cannot close file");
}
std::cout << std::fixed << std::setprecision(2)
<< "Done " << count << " ops" << " in " << watch.elapsedSeconds() << " sec."
<< ", " << count / watch.elapsedSeconds() << " ops/sec."
<< ", " << count * block_size / watch.elapsedSeconds() / 1000000 << " MB/sec."
<< std::endl;
return 0;
}