projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
engines/libaio: don't reap on EAGAIN and no pending events
[fio.git]
/
server.c
diff --git
a/server.c
b/server.c
index 73866d770e3f3dc7722bec9434f70b054cd5e1cb..36713ee5716058fddf49f7213fe6d444b26b7c53 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-4,7
+4,6
@@
#include <unistd.h>
#include <limits.h>
#include <errno.h>
#include <unistd.h>
#include <limits.h>
#include <errno.h>
-#include <fcntl.h>
#include <sys/poll.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/poll.h>
#include <sys/types.h>
#include <sys/wait.h>
@@
-68,7
+67,7
@@
static const char *fio_server_ops[FIO_NET_CMD_NR] = {
"DISK_UTIL",
"SERVER_START",
"ADD_JOB",
"DISK_UTIL",
"SERVER_START",
"ADD_JOB",
- "CMD_RUN"
+ "CMD_RUN"
,
"CMD_IOLOG",
};
"CMD_IOLOG",
};
@@
-209,7
+208,7
@@
static int verify_convert_cmd(struct fio_net_cmd *cmd)
*/
struct fio_net_cmd *fio_net_recv_cmd(int sk)
{
*/
struct fio_net_cmd *fio_net_recv_cmd(int sk)
{
- struct fio_net_cmd cmd, *cmdret = NULL;
+ struct fio_net_cmd cmd, *
tmp, *
cmdret = NULL;
size_t cmd_size = 0, pdu_offset = 0;
uint16_t crc;
int ret, first = 1;
size_t cmd_size = 0, pdu_offset = 0;
uint16_t crc;
int ret, first = 1;
@@
-232,7
+231,19
@@
struct fio_net_cmd *fio_net_recv_cmd(int sk)
} else
cmd_size += cmd.pdu_len;
} else
cmd_size += cmd.pdu_len;
- cmdret = realloc(cmdret, cmd_size);
+ if (cmd_size / 1024 > FIO_SERVER_MAX_CMD_MB * 1024) {
+ log_err("fio: cmd+pdu too large (%llu)\n", (unsigned long long) cmd_size);
+ ret = 1;
+ break;
+ }
+
+ tmp = realloc(cmdret, cmd_size);
+ if (!tmp) {
+ log_err("fio: server failed allocating cmd\n");
+ ret = 1;
+ break;
+ }
+ cmdret = tmp;
if (first)
memcpy(cmdret, &cmd, sizeof(cmd));
if (first)
memcpy(cmdret, &cmd, sizeof(cmd));
@@
-544,6
+555,7
@@
static int handle_run_cmd(struct flist_head *job_list, struct fio_net_cmd *cmd)
pid_t pid;
int ret;
pid_t pid;
int ret;
+ fio_time_init();
set_genesis_time();
pid = fork();
set_genesis_time();
pid = fork();
@@
-654,21
+666,13
@@
static int handle_probe_cmd(struct fio_net_cmd *cmd)
static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
{
struct jobs_eta *je;
static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
{
struct jobs_eta *je;
- size_t size;
uint64_t tag = cmd->tag;
uint64_t tag = cmd->tag;
+ size_t size;
int i;
int i;
- if (!thread_number)
- return 0;
-
- size = sizeof(*je) + thread_number * sizeof(char) + 1;
- je = malloc(size);
- memset(je, 0, size);
-
- if (!calc_thread_status(je, 1)) {
- free(je);
+ je = get_jobs_eta(1, &size);
+ if (!je)
return 0;
return 0;
- }
dprint(FD_NET, "server sending status\n");
dprint(FD_NET, "server sending status\n");
@@
-843,14
+847,12
@@
static int accept_loop(int listen_sk)
struct sockaddr_in6 addr6;
socklen_t len = use_ipv6 ? sizeof(addr6) : sizeof(addr);
struct pollfd pfd;
struct sockaddr_in6 addr6;
socklen_t len = use_ipv6 ? sizeof(addr6) : sizeof(addr);
struct pollfd pfd;
- int ret = 0, sk,
flags,
exitval = 0;
+ int ret = 0, sk, exitval = 0;
FLIST_HEAD(conn_list);
dprint(FD_NET, "server enter accept loop\n");
FLIST_HEAD(conn_list);
dprint(FD_NET, "server enter accept loop\n");
- flags = fcntl(listen_sk, F_GETFL);
- flags |= O_NONBLOCK;
- fcntl(listen_sk, F_SETFL, flags);
+ fio_set_fd_nonblocking(listen_sk, "server");
while (!exit_backend) {
const char *from;
while (!exit_backend) {
const char *from;
@@
-1095,18
+1097,19
@@
static void convert_dus(struct disk_util_stat *dst, struct disk_util_stat *src)
{
int i;
{
int i;
- strcpy((char *) dst->name, (char *) src->name);
+ dst->name[FIO_DU_NAME_SZ - 1] = '\0';
+ strncpy((char *) dst->name, (char *) src->name, FIO_DU_NAME_SZ - 1);
for (i = 0; i < 2; i++) {
for (i = 0; i < 2; i++) {
- dst->
ios[i] = cpu_to_le32(src->
ios[i]);
- dst->
merges[i] = cpu_to_le32(src->
merges[i]);
- dst->s
ectors[i] = cpu_to_le64(src->
sectors[i]);
- dst->
ticks[i] = cpu_to_le32(src->
ticks[i]);
+ dst->
s.ios[i] = cpu_to_le32(src->s.
ios[i]);
+ dst->
s.merges[i] = cpu_to_le32(src->s.
merges[i]);
+ dst->s
.sectors[i] = cpu_to_le64(src->s.
sectors[i]);
+ dst->
s.ticks[i] = cpu_to_le32(src->s.
ticks[i]);
}
}
- dst->
io_ticks = cpu_to_le32(src->
io_ticks);
- dst->
time_in_queue = cpu_to_le32(src->
time_in_queue);
- dst->
msec = cpu_to_le64(src->
msec);
+ dst->
s.io_ticks = cpu_to_le32(src->s.
io_ticks);
+ dst->
s.time_in_queue = cpu_to_le32(src->s.
time_in_queue);
+ dst->
s.msec = cpu_to_le64(src->s.
msec);
}
void fio_server_send_du(void)
}
void fio_server_send_du(void)
@@
-1174,7
+1177,7
@@
static int fio_send_iolog_gz(struct cmd_iolog_pdu *pdu, struct io_log *log)
}
stream.next_in = (void *) log->log;
}
stream.next_in = (void *) log->log;
- stream.avail_in = log->nr_samples *
sizeof(struct io_sample
);
+ stream.avail_in = log->nr_samples *
log_entry_sz(log
);
do {
unsigned int this_len, flags = 0;
do {
unsigned int this_len, flags = 0;
@@
-1211,19
+1214,27
@@
int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name)
struct cmd_iolog_pdu pdu;
int i, ret = 0;
struct cmd_iolog_pdu pdu;
int i, ret = 0;
+ pdu.nr_samples = cpu_to_le64(log->nr_samples);
pdu.thread_number = cpu_to_le32(td->thread_number);
pdu.thread_number = cpu_to_le32(td->thread_number);
- pdu.nr_samples = __cpu_to_le32(log->nr_samples);
pdu.log_type = cpu_to_le32(log->log_type);
pdu.compressed = cpu_to_le32(use_zlib);
pdu.log_type = cpu_to_le32(log->log_type);
pdu.compressed = cpu_to_le32(use_zlib);
- strcpy((char *) pdu.name, name);
+
+ strncpy((char *) pdu.name, name, FIO_NET_NAME_MAX);
+ pdu.name[FIO_NET_NAME_MAX - 1] = '\0';
for (i = 0; i < log->nr_samples; i++) {
for (i = 0; i < log->nr_samples; i++) {
- struct io_sample *s = &log->log[i];
+ struct io_sample *s = get_sample(log, i);
+
+ s->time = cpu_to_le64(s->time);
+ s->val = cpu_to_le64(s->val);
+ s->__ddir = cpu_to_le32(s->__ddir);
+ s->bs = cpu_to_le32(s->bs);
- s->time = cpu_to_le64(s->time);
- s->val = cpu_to_le64(s->val);
- s->ddir = cpu_to_le32(s->ddir);
- s->bs = cpu_to_le32(s->bs);
+ if (log->log_offset) {
+ struct io_sample_offset *so = (void *) s;
+
+ so->offset = cpu_to_le64(so->offset);
+ }
}
/*
}
/*
@@
-1241,7
+1252,7
@@
int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name)
return fio_send_iolog_gz(&pdu, log);
return fio_send_cmd_ext_pdu(server_fd, FIO_NET_CMD_IOLOG, log->log,
return fio_send_iolog_gz(&pdu, log);
return fio_send_cmd_ext_pdu(server_fd, FIO_NET_CMD_IOLOG, log->log,
- log->nr_samples *
sizeof(struct io_sample
), 0, 0);
+ log->nr_samples *
log_entry_sz(log
), 0, 0);
}
void fio_server_send_add_job(struct thread_data *td)
}
void fio_server_send_add_job(struct thread_data *td)
@@
-1338,7
+1349,7
@@
static int fio_init_server_sock(void)
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
- str
cpy(addr.sun_path, bind_sock
);
+ str
ncpy(addr.sun_path, bind_sock, sizeof(addr.sun_path) - 1
);
len = sizeof(addr.sun_family) + strlen(bind_sock) + 1;
len = sizeof(addr.sun_family) + strlen(bind_sock) + 1;
@@
-1367,6
+1378,8
@@
static int fio_init_server_connection(void)
if (sk < 0)
return sk;
if (sk < 0)
return sk;
+ memset(bind_str, 0, sizeof(bind_str));
+
if (!bind_sock) {
char *p, port[16];
const void *src;
if (!bind_sock) {
char *p, port[16];
const void *src;
@@
-1386,9
+1399,9
@@
static int fio_init_server_connection(void)
if (p)
strcat(p, port);
else
if (p)
strcat(p, port);
else
- str
cpy(bind_str, port
);
+ str
ncpy(bind_str, port, sizeof(bind_str) - 1
);
} else
} else
- str
cpy(bind_str, bind_sock
);
+ str
ncpy(bind_str, bind_sock, sizeof(bind_str) - 1
);
log_info("fio: server listening on %s\n", bind_str);
log_info("fio: server listening on %s\n", bind_str);
@@
-1696,7
+1709,7
@@
int fio_start_server(char *pidfile)
int ret = write_pid(pid, pidfile);
free(pidfile);
int ret = write_pid(pid, pidfile);
free(pidfile);
- exit(ret);
+
_
exit(ret);
}
setsid();
}
setsid();