#endif
#include "fio.h"
+#include "options.h"
#include "server.h"
#include "crc/crc16.h"
#include "lib/ieee754.h"
reply = calloc(1, sizeof(*reply));
INIT_FLIST_HEAD(&reply->list);
- gettimeofday(&reply->tv, NULL);
+ fio_gettime(&reply->tv, NULL);
reply->saved_tag = tag;
reply->opcode = opcode;
_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 */
+ get_my_addr_str(sk); /* if error, it's already logged, non-fatal */
handle_connection(sk);
}
p.ts.latency_window = cpu_to_le64(ts->latency_window);
p.ts.latency_percentile.u.i = cpu_to_le64(fio_double_to_uint64(ts->latency_percentile.u.f));
+ p.ts.nr_block_infos = le64_to_cpu(ts->nr_block_infos);
+ for (i = 0; i < p.ts.nr_block_infos; i++)
+ p.ts.block_infos[i] = le32_to_cpu(ts->block_infos[i]);
+
convert_gs(&p.rs, rs);
fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p), NULL, NULL);
}
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;
/*
*datap = data;
sfree(rep->data);
+ __fio_mutex_remove(&rep->lock);
sfree(rep);
return 0;
}
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;
}