#endif
#include "fio.h"
+#include "options.h"
#include "server.h"
#include "crc/crc16.h"
#include "lib/ieee754.h"
size_t size;
int i;
- je = get_jobs_eta(1, &size);
- if (!je)
- return 0;
-
dprint(FD_NET, "server sending status\n");
- je->nr_running = cpu_to_le32(je->nr_running);
- je->nr_ramp = cpu_to_le32(je->nr_ramp);
- je->nr_pending = cpu_to_le32(je->nr_pending);
- je->nr_setting_up = cpu_to_le32(je->nr_setting_up);
- je->files_open = cpu_to_le32(je->files_open);
+ /*
+ * Fake ETA return if we don't have a local one, otherwise the client
+ * will end up timing out waiting for a response to the ETA request
+ */
+ je = get_jobs_eta(1, &size);
+ if (!je) {
+ size = sizeof(*je);
+ je = calloc(1, size);
+ } else {
+ je->nr_running = cpu_to_le32(je->nr_running);
+ je->nr_ramp = cpu_to_le32(je->nr_ramp);
+ je->nr_pending = cpu_to_le32(je->nr_pending);
+ je->nr_setting_up = cpu_to_le32(je->nr_setting_up);
+ je->files_open = cpu_to_le32(je->files_open);
+
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+ je->m_rate[i] = cpu_to_le32(je->m_rate[i]);
+ je->t_rate[i] = cpu_to_le32(je->t_rate[i]);
+ je->m_iops[i] = cpu_to_le32(je->m_iops[i]);
+ je->t_iops[i] = cpu_to_le32(je->t_iops[i]);
+ je->rate[i] = cpu_to_le32(je->rate[i]);
+ je->iops[i] = cpu_to_le32(je->iops[i]);
+ }
- for (i = 0; i < DDIR_RWDIR_CNT; i++) {
- je->m_rate[i] = cpu_to_le32(je->m_rate[i]);
- je->t_rate[i] = cpu_to_le32(je->t_rate[i]);
- je->m_iops[i] = cpu_to_le32(je->m_iops[i]);
- je->t_iops[i] = cpu_to_le32(je->t_iops[i]);
- je->rate[i] = cpu_to_le32(je->rate[i]);
- je->iops[i] = cpu_to_le32(je->iops[i]);
+ je->elapsed_sec = cpu_to_le64(je->elapsed_sec);
+ je->eta_sec = cpu_to_le64(je->eta_sec);
+ je->nr_threads = cpu_to_le32(je->nr_threads);
+ je->is_pow2 = cpu_to_le32(je->is_pow2);
+ je->unit_base = cpu_to_le32(je->unit_base);
}
- je->elapsed_sec = cpu_to_le64(je->elapsed_sec);
- je->eta_sec = cpu_to_le64(je->eta_sec);
- je->nr_threads = cpu_to_le32(je->nr_threads);
- je->is_pow2 = cpu_to_le32(je->is_pow2);
- je->unit_base = cpu_to_le32(je->unit_base);
-
fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, &tag, NULL);
free(je);
return 0;
_exit(ret);
}
+/* get the address on this host bound by the input socket,
+ * whether it is ipv6 or ipv4 */
+
+int get_my_addr_str( int sk )
+{
+ int ret;
+ struct sockaddr * sockaddr_p;
+ struct sockaddr_in myaddr4 = {0};
+ struct sockaddr_in6 myaddr6 = {0};
+ char * net_addr;
+ socklen_t len = use_ipv6 ? sizeof(myaddr6) : sizeof(myaddr4);
+
+ if (use_ipv6)
+ sockaddr_p = (struct sockaddr * )&myaddr6;
+ else
+ sockaddr_p = (struct sockaddr * )&myaddr4;
+ ret = getsockname(sk, sockaddr_p, &len);
+ if (ret) {
+ log_err("fio: getsockaddr: %s\n", strerror(errno));
+ return -1;
+ }
+ if (use_ipv6)
+ net_addr = (char * )&myaddr6.sin6_addr;
+ else
+ net_addr = (char * )&myaddr4.sin_addr;
+ if (NULL == inet_ntop(use_ipv6?AF_INET6:AF_INET, net_addr, client_sockaddr_str, INET6_ADDRSTRLEN-1)) {
+ log_err("inet_ntop: failed to convert addr to string\n");
+ return -1;
+ }
+ dprint(FD_NET, "fio server bound to addr %s\n", client_sockaddr_str);
+ return 0;
+}
+
static int accept_loop(int listen_sk)
{
struct sockaddr_in addr;
}
/* exits */
- strncpy(client_sockaddr_str, from, INET6_ADDRSTRLEN);
+ get_my_addr_str(sk); /* if error, it's already logged, non-fatal */
handle_connection(sk);
}
}
int fio_server_get_verify_state(const char *name, int threadnumber,
- void **datap)
+ void **datap, int *version)
{
struct thread_io_list *s;
struct cmd_sendfile out;
* the header, and the thread_io_list checksum
*/
s = rep->data + sizeof(struct verify_state_hdr);
- if (verify_state_hdr(rep->data, s))
+ if (verify_state_hdr(rep->data, s, version))
goto fail;
/*
opt = 1;
if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)) < 0) {
- log_err("fio: setsockopt: %s\n", strerror(errno));
+ log_err("fio: setsockopt(REUSEADDR): %s\n", strerror(errno));
close(sk);
return -1;
}
#ifdef SO_REUSEPORT
if (setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
- log_err("fio: setsockopt: %s\n", strerror(errno));
+ log_err("fio: setsockopt(REUSEPORT): %s\n", strerror(errno));
close(sk);
return -1;
}