projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix variable type warning
[fio.git]
/
server.c
diff --git
a/server.c
b/server.c
index 5e94696eb6aa6ee79d34668723b3981f1384d4dd..f8c36357a2dbfcce3577d94c8f94466cb979538d 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;
@@
-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;
@@
-453,8
+450,9
@@
static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
je->iops[i] = cpu_to_le32(je->iops[i]);
}
je->iops[i] = cpu_to_le32(je->iops[i]);
}
- je->elapsed_sec = cpu_to_le
32(je->nr_running
);
+ je->elapsed_sec = cpu_to_le
64(je->elapsed_sec
);
je->eta_sec = cpu_to_le64(je->eta_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);
@@
-1188,8
+1186,8
@@
int fio_start_server(char *pidfile)
int ret;
#if defined(WIN32)
int ret;
#if defined(WIN32)
- WSADATA wsd;
- WSAStartup(MAKEWORD(2,2), &wsd);
+
WSADATA wsd;
+
WSAStartup(MAKEWORD(2,2), &wsd);
#endif
if (!pidfile)
#endif
if (!pidfile)