server: add a few more debug logging statements

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/client.c b/client.c
index 12c2c37732c3321c2a08c2e573a4b9c2c79cd12f..4d233415b8761aad83cb91a9633045dac46f0b3d 100644 (file)
--- a/client.c
+++ b/client.c
@@ -171,6 +171,8 @@ void fio_clients_terminate(void)
        struct flist_head *entry;
        struct fio_client *client;
 
+       dprint(FD_NET, "client: terminate clients\n");
+
        flist_for_each(entry, &client_list) {
                client = flist_entry(entry, struct fio_client, list);
 
@@ -180,6 +182,7 @@ void fio_clients_terminate(void)
 
 static void sig_int(int sig)
 {
+       dprint(FD_NET, "client: got sign %d\n", sig);
        fio_clients_terminate();
 }
 
@@ -200,6 +203,8 @@ static void client_signal_handler(void)
 
 static void probe_client(struct fio_client *client)
 {
+       dprint(FD_NET, "client: send probe\n");
+
        fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0);
        handle_client(client, 1);
 }
@@ -209,6 +214,8 @@ static int send_client_cmd_line(struct fio_client *client)
        struct cmd_line_pdu *pdu;
        int i, ret;
 
+       dprint(FD_NET, "client: send cmdline\n");
+
        pdu = malloc(sizeof(*pdu));
        for (i = 0; i < client->argc; i++)
                strcpy((char *) pdu->argv[i], client->argv[i]);
@@ -225,6 +232,8 @@ int fio_clients_connect(void)
        struct flist_head *entry, *tmp;
        int ret;
 
+       dprint(FD_NET, "client: connect all\n");
+
        client_signal_handler();
 
        flist_for_each_safe(entry, tmp, &client_list) {
@@ -454,6 +463,8 @@ static int handle_client(struct fio_client *client, int one)
        struct fio_net_cmd *cmd;
        int done = 0;
 
+       dprint(FD_NET, "client: handle %s\n", client->hostname);
+
        while ((cmd = fio_net_recv_cmd(client->fd, 1)) != NULL) {
                dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
                                                        cmd->opcode);

diff --git a/server.c b/server.c
index dee164daa1ae99bc6ac1cf769f0e64a002f81a04..6a228ce205263ede7cf718bab51ecec61a903127 100644 (file)
--- a/server.c
+++ b/server.c
@@ -396,6 +396,8 @@ static int accept_loop(int listen_sk)
        struct pollfd pfd;
        int ret, sk, flags, exitval = 0;
 
+       dprint(FD_NET, "server enter accept loop\n");
+
        flags = fcntl(listen_sk, F_GETFL);
        flags |= O_NONBLOCK;
        fcntl(listen_sk, F_SETFL, flags);
@@ -485,6 +487,8 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
        struct cmd_ts_pdu p;
        int i, j;
 
+       dprint(FD_NET, "server sending end stats\n");
+
        memset(&p, 0, sizeof(p));
 
        strcpy(p.ts.name, ts->name);
@@ -554,6 +558,8 @@ void fio_server_send_gs(struct group_run_stats *rs)
 {
        struct group_run_stats gs;
 
+       dprint(FD_NET, "server sending group run stats\n");
+
        convert_gs(&gs, rs);
        fio_net_send_cmd(server_fd, FIO_NET_CMD_GS, &gs, sizeof(gs));
 }
@@ -575,6 +581,8 @@ void fio_server_send_status(void)
                return;
        }
 
+       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);
@@ -602,6 +610,8 @@ int fio_server_log(const char *format, ...)
        va_list args;
        size_t len;
 
+       dprint(FD_NET, "server log\n");
+
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
@@ -682,7 +692,6 @@ static void server_signal_handler(void)
        sigaction(SIGTERM, &act, NULL);
 }
 
-
 int fio_start_server(int daemonize)
 {
        pid_t pid;