projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
windows: use hweight64(), it's a 64-bit type
[fio.git]
/
server.c
diff --git
a/server.c
b/server.c
index 33f69ef611a7ae2dd7eda4bd7e0e15c3284487a6..ffa6ed4bdfa7db270181bab4e2ab7a48d2f6f979 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-22,8
+22,6
@@
#include "crc/crc16.h"
#include "lib/ieee754.h"
#include "crc/crc16.h"
#include "lib/ieee754.h"
-#include "fio_version.h"
-
int fio_net_port = 8765;
int exit_backend = 0;
int fio_net_port = 8765;
int exit_backend = 0;
@@
-312,7
+310,7
@@
int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t tag,
fio_net_cmd_crc(&cmd->cmd);
INIT_FLIST_HEAD(&cmd->list);
fio_net_cmd_crc(&cmd->cmd);
INIT_FLIST_HEAD(&cmd->list);
-
gettimeofday
(&cmd->tv, NULL);
+
fio_gettime
(&cmd->tv, NULL);
cmd->saved_tag = tag;
ret = fio_send_data(sk, &cmd->cmd, sizeof(cmd->cmd));
cmd->saved_tag = tag;
ret = fio_send_data(sk, &cmd->cmd, sizeof(cmd->cmd));
@@
-344,6
+342,7
@@
static int handle_job_cmd(struct fio_net_cmd *cmd)
}
spdu.jobs = cpu_to_le32(thread_number);
}
spdu.jobs = cpu_to_le32(thread_number);
+ spdu.stat_outputs = cpu_to_le32(stat_number);
fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0);
ret = fio_backend();
fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0);
ret = fio_backend();
@@
-407,9
+406,7
@@
static int handle_probe_cmd(struct fio_net_cmd *cmd)
#ifdef FIO_BIG_ENDIAN
probe.bigendian = 1;
#endif
#ifdef FIO_BIG_ENDIAN
probe.bigendian = 1;
#endif
- probe.fio_major = FIO_MAJOR;
- probe.fio_minor = FIO_MINOR;
- probe.fio_patch = FIO_PATCH;
+ strncpy((char *) probe.fio_version, fio_version_string, sizeof(probe.fio_version));
probe.os = FIO_OS;
probe.arch = FIO_ARCH;
probe.os = FIO_OS;
probe.arch = FIO_ARCH;
@@
-455,6
+452,7
@@
static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
je->elapsed_sec = cpu_to_le64(je->elapsed_sec);
je->eta_sec = cpu_to_le64(je->eta_sec);
je->elapsed_sec = cpu_to_le64(je->elapsed_sec);
je->eta_sec = cpu_to_le64(je->eta_sec);
+ je->is_pow2 = cpu_to_le32(je->is_pow2);
fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag);
free(je);
fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag);
free(je);
@@
-563,7
+561,7
@@
void fio_server_idle_loop(void)
static int accept_loop(int listen_sk)
{
struct sockaddr_in addr;
static int accept_loop(int listen_sk)
{
struct sockaddr_in addr;
-
fio_
socklen_t len = sizeof(addr);
+ socklen_t len = sizeof(addr);
struct pollfd pfd;
int ret, sk, flags, exitval = 0;
struct pollfd pfd;
int ret, sk, flags, exitval = 0;
@@
-817,7
+815,7
@@
int fio_server_log(const char *format, ...)
static int fio_init_server_ip(void)
{
struct sockaddr *addr;
static int fio_init_server_ip(void)
{
struct sockaddr *addr;
-
fio_
socklen_t socklen;
+ socklen_t socklen;
int sk, opt;
if (use_ipv6)
int sk, opt;
if (use_ipv6)
@@
-866,7
+864,7
@@
static int fio_init_server_ip(void)
static int fio_init_server_sock(void)
{
struct sockaddr_un addr;
static int fio_init_server_sock(void)
{
struct sockaddr_un addr;
-
fio_
socklen_t len;
+ socklen_t len;
mode_t mode;
int sk;
mode_t mode;
int sk;