Remove copy-pasted read/write _blocking

This commit is contained in:
Vitaliy Filippov
2020-02-09 19:23:03 +03:00
parent 1513d0490a
commit 327f310868
3 changed files with 6 additions and 106 deletions
+1 -51
View File
@@ -25,6 +25,7 @@
#include <vector>
#include <unordered_map>
#include "rw_blocking.h"
#include "osd_ops.h"
extern "C" {
#define CONFIG_PWRITEV2
@@ -75,9 +76,6 @@ static struct fio_option options[] = {
},
};
static int read_blocking(int fd, void *read_buf, size_t remaining);
static int write_blocking(int fd, void *write_buf, size_t remaining);
static int sec_setup(struct thread_data *td)
{
sec_data *bsd;
@@ -226,54 +224,6 @@ static enum fio_q_status sec_queue(struct thread_data *td, struct io_u *io)
return FIO_Q_QUEUED;
}
static int read_blocking(int fd, void *read_buf, size_t remaining)
{
size_t done = 0;
while (done < remaining)
{
size_t r = read(fd, read_buf, remaining-done);
if (r <= 0)
{
if (!errno)
{
// EOF
return done;
}
else if (errno != EAGAIN && errno != EPIPE)
{
perror("read");
exit(1);
}
continue;
}
done += r;
read_buf += r;
}
return done;
}
static int write_blocking(int fd, void *write_buf, size_t remaining)
{
size_t done = 0;
while (done < remaining)
{
size_t r = write(fd, write_buf, remaining-done);
if (r < 0)
{
if (errno != EAGAIN && errno != EPIPE)
{
perror("write");
exit(1);
}
continue;
}
done += r;
write_buf += r;
}
return done;
}
static int sec_getevents(struct thread_data *td, unsigned int min, unsigned int max, const struct timespec *t)
{
sec_data *bsd = (sec_data*)td->io_ops_data;