projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: check for gtk version using pkg-config
[fio.git]
/
server.c
diff --git
a/server.c
b/server.c
index b966c66cbfe342d476b8054e2665932004ed41ba..2a33770733e99e447f16511061f9f21a2699f2f5 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-28,7
+28,7
@@
int fio_net_port = FIO_NET_PORT;
int fio_net_port = FIO_NET_PORT;
-
int exit_backend = 0
;
+
bool exit_backend = false
;
enum {
SK_F_FREE = 1,
enum {
SK_F_FREE = 1,
@@
-296,6
+296,8
@@
static int verify_convert_cmd(struct fio_net_cmd *cmd)
if (crc != cmd->cmd_crc16) {
log_err("fio: server bad crc on command (got %x, wanted %x)\n",
cmd->cmd_crc16, crc);
if (crc != cmd->cmd_crc16) {
log_err("fio: server bad crc on command (got %x, wanted %x)\n",
cmd->cmd_crc16, crc);
+ fprintf(f_err, "fio: server bad crc on command (got %x, wanted %x)\n",
+ cmd->cmd_crc16, crc);
return 1;
}
return 1;
}
@@
-310,6
+312,8
@@
static int verify_convert_cmd(struct fio_net_cmd *cmd)
break;
default:
log_err("fio: bad server cmd version %d\n", cmd->version);
break;
default:
log_err("fio: bad server cmd version %d\n", cmd->version);
+ fprintf(f_err, "fio: client/server version mismatch (%d != %d)\n",
+ cmd->version, FIO_SERVER_VER);
return 1;
}
return 1;
}
@@
-991,7
+995,7
@@
static int handle_command(struct sk_out *sk_out, struct flist_head *job_list,
ret = 0;
break;
case FIO_NET_CMD_EXIT:
ret = 0;
break;
case FIO_NET_CMD_EXIT:
- exit_backend =
1
;
+ exit_backend =
true
;
return -1;
case FIO_NET_CMD_LOAD_FILE:
ret = handle_load_file_cmd(cmd);
return -1;
case FIO_NET_CMD_LOAD_FILE:
ret = handle_load_file_cmd(cmd);
@@
-1526,6
+1530,7
@@
void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
p.ts.total_submit = cpu_to_le64(ts->total_submit);
p.ts.total_complete = cpu_to_le64(ts->total_complete);
p.ts.total_submit = cpu_to_le64(ts->total_submit);
p.ts.total_complete = cpu_to_le64(ts->total_complete);
+ p.ts.nr_zone_resets = cpu_to_le64(ts->nr_zone_resets);
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
p.ts.io_bytes[i] = cpu_to_le64(ts->io_bytes[i]);
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
p.ts.io_bytes[i] = cpu_to_le64(ts->io_bytes[i]);
@@
-1558,6
+1563,9
@@
void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
p.ts.ss_deviation.u.i = cpu_to_le64(fio_double_to_uint64(ts->ss_deviation.u.f));
p.ts.ss_criterion.u.i = cpu_to_le64(fio_double_to_uint64(ts->ss_criterion.u.f));
p.ts.ss_deviation.u.i = cpu_to_le64(fio_double_to_uint64(ts->ss_deviation.u.f));
p.ts.ss_criterion.u.i = cpu_to_le64(fio_double_to_uint64(ts->ss_criterion.u.f));
+ p.ts.cachehit = cpu_to_le64(ts->cachehit);
+ p.ts.cachemiss = cpu_to_le64(ts->cachemiss);
+
convert_gs(&p.rs, rs);
dprint(FD_NET, "ts->ss_state = %d\n", ts->ss_state);
convert_gs(&p.rs, rs);
dprint(FD_NET, "ts->ss_state = %d\n", ts->ss_state);
@@
-2488,7
+2496,7
@@
void fio_server_got_signal(int signal)
sk_out->sk = -1;
else {
log_info("\nfio: terminating on signal %d\n", signal);
sk_out->sk = -1;
else {
log_info("\nfio: terminating on signal %d\n", signal);
- exit_backend =
1
;
+ exit_backend =
true
;
}
}
}
}
@@
-2570,7
+2578,7
@@
int fio_start_server(char *pidfile)
setsid();
openlog("fio", LOG_NDELAY|LOG_NOWAIT|LOG_PID, LOG_USER);
setsid();
openlog("fio", LOG_NDELAY|LOG_NOWAIT|LOG_PID, LOG_USER);
- log_syslog =
1
;
+ log_syslog =
true
;
close(STDIN_FILENO);
close(STDOUT_FILENO);
close(STDERR_FILENO);
close(STDIN_FILENO);
close(STDOUT_FILENO);
close(STDERR_FILENO);